I'm thinking I'll revert back to 4S now. The 3S batteries are just too big, I think it's overkill and the big motor is too much. I'm pretty annoyed that I was given a bum steer.
I'm going to use the bigger setup in a new mono hull.
Now I need to figure out what the best motor is going to be for the hydro. There is several standard options that clubs use in their rules in the US but as far as I can tell they're no longer available.
More research required.
In the meantime, I've had to move my little workshop, which is why things have been moving slowly. That should be finished this weekend and I can get on with it.