brakes before rims IMO.
i've just fitted 324mm discs and four pots under 16" rims on my xr2, they're a bit big, but wouldn't go smaller now, even for "nicer" wheels.
comps are tidy, just be careful of kerbs.