[JohnA]

Both would be best. They are not mutually exclusive.

Any air/air or water/air intercoling would allow you to use lower quantities of water/alc injection, so it would last longer :wink:
You've got a big engine there, it would need a seriously large water tank to sustain boost for half and hour. If it's already intercooled half-way it would be much better.