It will change a bit once you get to level 70. In general, though, yes you will want to try and pair Upheaval with TOB when available. To be honest I've always struggled with the concept of using defensive CDs for offensive increases, but it does work. For future reference Upheaval is also buffed by Unchained, if for whatever reason you happen to be in Defiance. You're going to have to play it a little by ear, like if you are tanking a giant group of mobs in a dungeon it might be better to save TOB for clutch heal if needed. If tanking a single target boss you shouldn't really need TOB so use to boost Upheaval damage.