Scald > Surf on 90% of occasions for me.
Especially on rain, you wont be able to see much of a difference in power.
And if you really want to hit harder, then Hydro pump is the way to go, assuming you have rain.
Just some thoughts, my view of things is not set in stone XD