Just had a new water pump and spark plugs put in, now the engine is surging when you go across the water. Had a tough time starting it last night after we ran it for about 5 minutes. Seems to be smoking more than usual and running a bit rough in the no-wake zones. Any ideas?