Biggest improvement I made to the braking on mine was by fitting cast iron discs and braided lines.
Check out
http://www.ferodobraketech.com/ - I'm lusting after a pair of their Axis Ductile Iron discs at the moment!
Sorry - I've got no experience of waveys, but thought I'd throw this in as an alternative!
