Just wrapping this up, a few loose end left but she's running and functional again.
I bought the 2UZ kit from Elate, it took about 3 months to come in but was well worth the wait. Link to the current kit, you can also add the crossover water pipe which is modifed already to avoid welding...