Just for clarification - have you actually turned the battery switch off then back on when the motor was "warm" - then tried to start it? Why I ask is that maybe the solenoid may not be fulling opening until the current is cut - turning off the battery switch when you leave the boat.
Have turned the switch to the off position yes.