I'm about to go the same route you are. I am buying the wildwood kit for the front and keep my current master for a while. then when/if I switch the rears to disc I will change the master but I see no reason why the current one can't handle it. And if not then I will upgrade the master too. Maybe to the vette one that sells for 70 bucks at napa.