I went through a similar evolution (although I am still evolving) and I now use a champ rhyno for shorter shots <150 (which I can actually backhand or flick- I think the stiff plastic helps) and a z-buzz for stuff that is a little longer. I can also backhand or flick the buzzz, the rim is a little more flick friendly than the roc. I just got a heavier, more flat topped buzzz (= more stable, right?) so I'm learning it also. I will also use my champ banshee when I need more of a curvy line or for a spike hyzer.
And just a word on the importance of upshots. I am not a great driver, but my upshots are really good, and because of this I just won the Int. Am. division in my first PDGA tourney, the Bull City Showdown (Shootout?). I didn't hit a ton of birdies, but I had no fives and not too many fours. I attribute much of my victory to the Rhyno and Buzzz.