Forgot to add:
What do y'all think of, rather than renaming WasRd -> WasAve, simply folding it into the US9_S/NJ35_S point per 1PPI?
The exit ramp departs inna cloverleaf stylee just about exactly where the onramp joins, and that exit movement is missing at Upper Main St itself.
Also note FWIW how NJ35 lacks the onramp point at Bordentown Ave.