Why are you "upgrading"? Is it for looks or are your brakes not performing as well as you want. If its for looks, then go ahead, but if its because you want better brakes you should first think of this.
Many Z owners "upgrade" because the original is very old and not performing good. They upgrade and say, wow now they work great, but they are comparing an old worn out system with everything new.
I chose to rebuild my standard system and for street it works great. No need to mess around trying other wheels and such. All the wheels for the Z will fit no problems.
-New rotors, cross drilled and slotted
-Calipers chemically cleaned, new seals and new pistons
-New wheel cylinders and shoes for rear, lightly machined the drums just to make sure they are round and no big waves in them
-Stainless steel braided brake lines
-New master cylinder and proportioning valve.
Here are some links on this issue
http://www.classiczcars.com/forums/thread47901.html
http://www.classiczcars.com/forums/thread42542.html
Chas