My boat was stored properly indoors from 1986 until the summer of 2010. It starts right up and runs decent, however at full throttle sometimes it will just lose RPM and die. It always fires right back up and runs the same but doesn't like to run at WOT for long. I would imagine that 24 years of hibernation has not been good to the rubber parts of the fuel system so I've been thinking about rebuilding the fuel pump and carbs to alleviate my problem. The motor is an inline 6, 115 HP from 1979. Am I on the right track?