After going through the Thunderbird Sport dual disc upgrade with Speedmaster bits, which does work very well IMHO, I would probably try the upgraded caliper first (I did use the single floating rotor with stock caliper before the TBS conversion and, meh). That said, I ain't giving up my TBS wheel.
