Most versions I've seen have been pretty strange, some even downright nightmarish. If memory serves, the original version was absolutely terrifying, however, your dreams tend to take these sorts of things to their extremes, don't they.
Your offer would be appreciated, but yes, it would probably be inappropriate. Though perhaps you could be a kind of lifeguard in case it turns out that all water zaps my energy. The hana-hana no mi is useful, but it's drawback is maddening. Who ever heard of a pirate who can't go into the water?!