Unless you know what brand of fuel fill you have, you will need to replace the fuel fill and cap.
They are not universal
I would have thrown the dock boy in the water
guessing you are doing a repower
Carter marine universal electric fuel pump. $85 (summit), oil pressure switch $20 (NAPA - see links in electrical forum), relay and socket $10 - newark or digikey
find the leak. if oil is leaking out, water is leaking in.
potential leak spots that will get into the water stream and ultimately into the exhaust stream are Power Steering cooler and oil cooler
drive oil would not mix with the exhaust. however leak externally. maybe a prop shaft leak.
exhaust with unburnt oil is the number one cause of oil residue in a test tank
water leaking means you have a problem you need to fix
smokey exhaust because its a 2-stroke