Watch eBay and buy Infinity Sport Calipers, you can buy them for a lot less than 370Z Sport calipers and they are exactly the same. That will save you some money..
Buy the Brake Rotors and Brake Line upgrade kit from Z1 and you will have a complete system.