Yes you can do both on the same day. A water park is not considered one of the core parks and therefore doesn't need a hopper in order to get in if you've already visited a park on that day. It only requires either a paid admission ticket or the water park option on your park tickets.