I totally agree. In fact my friend and I pretty much said that exact same thing earlier...shower scenes good, sex scenes bad. :)

Shoot, if they want to accentuate the hotness of the guys, they just need to toss in a water entity MoTW episode every once in a while. Both boys go in the drink, and come out with clinging T-shirts they have to remove. Tousled hair. Droplets of water on eyelashes.

Win/win.