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