I think the simplest thing I'd be happy with is having control over which buff is active, and giving the buffs a minimum. Instead of scaling from 0%, scale from maybe 50% of the maximum value. It'd be nice if it was also affected by your abilities, so for example sleight of hand and prism could forcibly increase the buff you get when near them (for both DR and damage). Having a corresponding portion of the other buff active might also be good, so if at 75% damage you get 25% DR and vice versa, though that'd need tweaking to prevent the damage buff simply being better. That keeps a bit of the flavour while making it a much more reliable ability.
I do also like the spotlight idea that's been mentioned. If implemented, I think it'd be worth changing total eclipse to be more like prism guard, allowing a guaranteed buff of your choice wherever you move (perhaps with reduced effectiveness). Kinda best of both worlds.