New disks and pads did the trick for me. I'm also running the EP alu bells and had trouble at Ledenon this summer.
Braking just didn't feel under control. The grooves on the outside of the discs were about 0,5mm, they had worn away (is that good English?) on the inner sides.
I couldn't believe the difference on Zandvoort, which is also hard for the brakes, with my fresh set!
I'd try replacing the consumables first.