If you take care of these two items above (Ie water fitness and flexibility/core strength) you has to offer your surfing fitness a definite booster using a functional training program specific to surfing.
Don't discard something when you need not.