Honestly, as much as I don't really like homogenization, this is probably the best idea. Change crit chance raid buffs into crit damage raid buffs, and give every dps class some kind of auto-crit to align with the 2-minute window.