Not precisely vapor lock, however I have experienced gas boiling in the fuel rail on a Jeep 4.0. Not driving, though. Jeeps will do it under specific circumstances when parked and then restarted hot, say 5 minutes later in hot weather.
The heat from the exhaust manifold boils the gas in the rail, and when you start it, it will have a dead miss for a few seconds until the vapor is cleared. Jeep issued a revised insulator to try and fix it IIRC.
Insofar as today’s patient, the only theory I can invent where both problems spring from a single cause is if the pump is somehow having a suction side leak and injecting air into the fuel system. Which seems unlikely with a submerged pump. I will have them save me the old one for dissection.
The stumble does seem to increase in frequency as I’ve drawn down the fuel level to make it easier for the tank removal.