Which is the better discount?

[Sheriff Woody]

I'm trying to choose between buying a regular park-hopper pass for a few days and using my DVC discount to buy one-day tix for TL and DQ. Does that work out better than buying park-hoppers with water-park-and-more option? Specifically I am thinking of a two-day hopper and intend to visit a water park one time and DQ one time.

I think I already know the answer to the following, but will ask anyway; can the TL and DQ discounts be applied to the water-park-and-more option?

TIA