My mechanic has this running great now. Had issues last year with starting. Replaced the starter and also replaced internal charging system with alternator....However, after running on the water for about 30 mins, the engine will start running rough, lose rpms, then speed up , slow down...