The best thing to do with this is just keep going following the "broken" rotation. It's important to remember that the DRG "rotation" is just a priority system. You would lose DPS if you attempted to do anything to "recover" that. Following what you posted there when the situation demands won't lose you any DPS over trying to strictly follow the default order, so it's best to just get used to the idea of the priority system over a rotation.