Just an update. Stayed with the 13/17 prop in the 144 pump (original shoe), put the Factory B-Pipe, Carb Rebuild/Jet/Spring . . . everything else is stock. All I can way is WOW. What a difference. The pipe made a HUGE difference. So much of a difference, that it has enough power for my skill level that I am done with mods for a while. Very happy. As far as the bilge, I put in a new RULE 500 (mounted left/rear of engine, near one-way valve hole) and did go with a float switch (not ideal) but only looking for emergency. So far it has worked well when testing it, and I haven't had a need to have it work in an emergency. . . now that I am happy with the power on my FX1 I am working on a X2 for my daughter. . . all I can say is that 650 w/Westcoast pipe, head, waterbox, 38mm carb, 15.5 impeller, . . is a dog compared to the FX1.
Thanks again to everyones advice!