I’m 50/50 with taking my car to Japanese Imports for the swap right now. They’re an affiliate on this board. Dennis says he can get it done in 2 weeks max.
The other 50% is me doing it myself. I’m thinking of taking a week off of work and doing nothing but that for the week. I’ve done bigger stuff on cars in less than a week hurriedly so I’m thinking this shouldn’t be too far off if I take my time.
I usually do all the work myself so I’m not sure of any specific Z shop, but JI can probably do things for you. They always have Skylines and I’ve seen a few Zs there too.
http://www.japaneseimports.ca
I don’t know if Angelica has any other suggestions. Shorteaz??