Third time is a charm. Finally got a VIN assigned and now eligible for getting registration for the trailer. Just in time for an upcoming trip to a lake that actually has water. In that time while fighting with the DMV, I completely redid the fuel system. The cheap Chinese pump would only pump at 2psi so I replaced it with a Carter p4594 and now get a solid 5psi. That will hopefully resolve the surging the boat had while at speed.