Did you get the Z31 bits from a Turbo option? They are a bit different. I used an NA MKII rear, which is the same as the S12 but for the hub for the vented rear disc.
I've half a mind to try fitting the 6-bolt flange to the z31 arm and useing the S12 driveshafts