@mntmn if it's only going to have very very occasional human interaction then yeah, shift the TVS out towards the actual port, you can elide it on the mainboard. (and doubling up might be problematic on USB3 in particular due to the capacitive loading).
d'you know what the expected max continuous load current is on VCC? and what EMC specs you're going to need to meet?