I think before you start doing a bunch of costly modifications you need to take some time and decide wheather or not your going to keep the boat in the long run because you'll never get your money out of them......if your going to keep it then have at it, go nuts.....if not, then just keep it clean and plan for the future.......reboating your power is a good idea too