Good luck with the rebuild. Looks like she needs it but I think the 2GM is worth the effort. I have a 2GM and I put my tank on a shelf under the cockpit floor above the stuffing box. The fill is on the cockpit floor but no problems with water or spills so far.