Good you got it rolling again.
I would suggest doing the brakes first, then the wheels.
If you go with discs in the rear, they will space out the wheel.
The front may or may not change, depending on what's installed.
It would suck to get a great combo then have issues after the brake swap.