I'm not Bill by a long shot, just so you know...
What's the reason for the upgrade? Racing, trackdays? streetrod?
If you can lock the brakes during hard braking, there's little to gain in braking power by upgrading.
If you need more efficient cooling to eliminate brake fade, look at bigger ventilated disks, increase airflow going to the disks, upgrade brakefluid,...