If you have troubles with alignment then you could fit an arbour with a tool in it to your Z axis and "line bore" your head stock using the Z axis. Then put the spindle into the bore.

Chich