I have 1997 200 2 stroke that was running great until I pulled it a couple weeks ago and had the water pump and oil tank replaced. Since then started stalling out and chugging when idling in and out of our marina. Replaced water seperating filter helped a little but now back to stalling and...