Longer form post why I'm considering new hardware. Hopefully you can help...?
@kev The budget option is to just replace the battery ($ 100), and even a microATX tower might fit a small PCIe card for USB 3. (Otherwise you might look into going with a Ryzen CPU, B550 Mainboard and DDR 4 Ram, which will add up to about $/€ 500). The other way would be to go with a Ryzen notebook with a Renoir (4th generation) APU, which should be the best bang for your buck. There are even some Linux centric hardware vendors that sell these. That would cost you around $/€ 1000.
Fosstodon is an English speaking Mastodon instance that is open to anyone who is interested in technology; particularly free & open source software.