If you also play games, maybe get a eGPU which you can use as a docking station. You could also connect a faster dispay to that. About the only thing I dont like on my Framework is the slow screen.

I really prefer a simple fan. Much more cooling potential

I dont know how much Performance you need until Match but you could maybe buy something used for little money on eBay.

Also what exactly happened to your Computer? Maybe we can fix it. At least until you get the 16