Looking good mate.

With the gearbox you can actually by the revised but through Nissan. Garry at nizzbits or patrolapart will be able to help you. If you haven't sourced this already.