I've done two dual master cylinder upgrades, both with stock drum/drum brake set ups. It's not as hard as it may seem. You could do the upgrade now with drum/drum set up, then upgrade to discs and then add your residual valve then. Just a thought.....