Good to hear you will be getting another Z. If the labor really was $4k, then it sounds like the mechanic took his time on installing the engine, either that, or he didn't know what he was doing and it took him forever.
Either way, I hope you get this Z as Sapphire Blue is the best color ever.