As for upgrades, I tend to favor the "Relative" upgrades. If testing in SimC, for the most part it works out correctly. Sure there will variance on placement generally those are side-grades to one another.
As for RoR, yea it will be funky. Luckly I should be next on the list to get the trinket (our Feral Druid got his last week).