@pinsl compare to my original where i tried to guard this stub (the stub itself is also not great of course) with GND vias. if i were to redo this i would also not route the Net-J1-Pin-1 trace (5V) there across the USB-C...
in any case i would upgrade this to 4 layer