My 1982 Johnson 25 HP Model # J25TELCNB outboard is running rough. Took off, and totally cleaned carb., replaced almost all wiring, sprayed carb. cleaner in cylinders, plenty of spark. It starts okay, seems to idle fine, then starts sputtering, and dies, but will restart. It smokes up a storm, and can't seem to get the Lean/Rich right. I think it is running very rich, but the needle valve doesn't seem to cooperate. Fuel pump is working okay. Lots of dirty/oily water in water bucket. I was dumb, and used about 1.5 gallons of last years gas/oil mixture, but added 4 new gallons to it. Do you guys think my needle valve is bad? Was wondering, if getting it on the water and running it for awhile in gear will help? Getting frustrated, and fishing is almost here!!! 