you are going to upgrade to the wagon rotors and calipers and also upgrade your pads you are better off to again swap over to the CL hubs and use the 3.0 CL rotors which are 11" rotors same as the wagon also need to get the 3.0 CL calipers and get brake pads as well. As far as what parts to get what what are you going to use the car for, street, track, autocross?????

My set up is powerslot rotors, Axxis metal master pads and she is awaiting SS brake lines.

You can also check accordinglydone.com they have a sticky about how to do the rotor over hub design using both the stock 10.2 inch rotor size and also the upgraded 11" rotor swap

Accordhybrid