I'm fairly restricted for space so I'm planning on duplicating the existing setup as much as possible. From a quick look it seems the same size fittings are still available but I haven't found the exhaust manifold flange yet and the fittings in the hardware store are galvanized steel so I'm still looking to see if I can find them in black iron. Where did you find the water injection elbow? I was going to have someone weld one up for me but if a suitable size is available off the shelf I may just buy one.