Heh. Even a riced T480 can have all that, except the CPU.
The current t14 with the 16:10 screen and improvements to repairability look good. I'm trying to patiently wait for them to start hitting the used market, but I also recently snapped off one of the two usbc ports on the 480.
Bad luck about your USB port. At least replacement T480 motherboards are not scarce!