Still not fixed.
Actually I went and tested again just to confirm and something strange happened. The first attack after the good buffs did the damage I'd expect, but then the second was back down to Outrage levels of damage. It's a difference of ~8000 so it's not just variance, not sure what happened there.