RE: choppy water
I'd think that with you living in the UK that you could find more self-righting boats there as I've seen a lot of articles on them in Marine Modeling International magazine.
Electric boats are the most used for your purpose but I have seen it done with nitro and gas powered boats.