Aikido is my non-surfing workout.
I try to surf everyday before work if swells and weather permit. It helps with keeping my balance and center, awareness, timing, not fight the ocean but go with it, working on my ukemi when i eat it...
Surfing and aikido are very similar i think.