Hey, me too :) I made myself one of those T25/T480 Frankenpads. But I'll probably use it until I spill coffee on the keyboard, because the mod cost the earth and everything except the keyboard is replaceable (and indeed, everything except the motherboard and bottom case has been replaced).

Bad luck about your USB port. At least replacement T480 motherboards are not scarce!