Sounds like a great plan, I too am in the middle of a rebuild. Nice pics!
I am no expert but I have been told that you shouldn't have both intercooler and water injection. Reason being that the intercooler prevents the water from having the desired affect. Like I said I am no expert, just thought I would pass it along.
1996 GMC K3500 Crew Cab Dually 8ft bed
Rebuilt engine 2/10 18:1 pistons, forged crank, Fluidamper, dsg gear drive timing, high flow oil pump, rebuilt GM8, turbomaster, Kennedy ECM, 4" exhaust, wrapped cross-over and down pipe, '98+ cooling, Duramax fan, aftermarket oil cooler and hoses
Rebuilt tranny 2/10