If the lug on the swingarm is the same, I don't see why the older style caliper and carrrier would not work. I'm pretty sure in '07 the MCs got the newer smaller calipers and the ECs the older stuff, and I doubt the swingarms are different. The older style (larger) pads are very common, so I would think the caliper is as well. As far as an upgrade goes I always thought the rear brake was more than enough and never had trouble with heat running organic pads.