Still sounds like water in the fuel.
Silly question, but you did put gas in it right? Seen people make that mistake a few times. Usually things won't run on diesel, but I've seen good running motors that will.
Still pretty sure it's a fuel issue.
It's a stretch, but it could be a loose ground and losing contact to the condenser. Rocking it makes it lose ground.
