For me it is definitely Typhoon. From a first impressions Standpoint, I was excited to experience Blizzard Beach for the first time, the mountain lodge feeling is great, but the snow is not, it's bright and honestly started giving me a headache after a few hours. I also found most of the attractions here less enjoyable. With the notable exception of Teamboat Springs, which I agree is one of the best attractions at both parks.
Typhoon is relaxing in almost every way. On one hand the slides here (With the exception of Crush and Gusher) are wildly outdated. Theme park technology has been knocked out of the park in the last decade or so, and Disney has (for the most part) not embraced that. So if you are looking for the latest and greatest try Aquatica Seaworld's waterpark, as they certainly have.
Now with Typhoon, The lazy River (Castaway Creek) is one of the best water park attractions I've been on, it's long, it's great for transportatiainment around the park, and the landscaping is beautiful. The same can be said for the magically wonderful wave pool. While I said that many of the slides are outdated, that does not detract from their classic enjoyment, this park is full of most simple and fun slides where Blizzard tried too hard to make things complicated over there. Typhoon Lagoon is also home to the shark reef, I'm a big chicken and was terrified to try it the first time, but now I love it and it really is a must-do for me in the parks. Crush and Gusher is also a highlight, and has become one of my favorites. As I said before the atmosphere here is completely relaxing, and as long as you don't go in the middle of peak summer (mid-june through mid-august) lines here are usually not terribly long. (But that can be said for both parks)
Hope this helped! Good luck planning your trip!