On those rear willwoods be sure to account for the rotor had thickness in your overall width. My set the hats are 1/2" thick so it adds 1" to the WMS width. Just about screwed myself on that one, my tires fit within 1/4" and that would have been an expensive redo.

New plan sounds good, faster never hurt anyone lol.