T480 Died - buy another or upgrade?

Hi all - My 6-year old T480 has started randomly shutting off & tech support has told me it's most likely a motherboard issue (and thus very expensive to fix), so I'm now in the market for a new machine. I use the laptop mostly for work (word processing/video calls), but also do a bit of streaming, photo editing and music production, nothing too resource intensive though.

My budget is $800 or so, but I love a lot of things about my t480 (the hot swappable battery, keyboard, durability, & ease of upgrading/repairing especially), so am strongly considering just getting another cheap used t480 as my next laptop; that would also allow me to migrate over my extra external batteries, ram, and ssd to the new machine & have spare parts in case anything else fails. I'm seeing i7 1.8GHz 32GB RAM 1TB SSD machines in the $250-$300 range on Ebay which seems like an excellent deal to me. If folks have advice for what to look out for as I'm searching through ebay let me know.

At the same time, I'm also considering whether a device with a better screen, battery, and smaller size might be worth the extra cost and more limited ability to upgrade or repair. The t490 and t14(/s) also seem like solid options. Open to any other ideas folks might have. Thanks!