I was thinking of xr3i/diesel rad with single pass intercooler? I've been looking at them and the rad will bolt in and it covers the full front end so bigger rad and no big gap at the side for air to get through. just a case of getting the intercooler pipes round to the engine.
Also have you seen that company do a S1 rad with a cover on the back with the fan in it? will that fit?
I was telling you at ford fair about waterless coolant mate and your right it doesn't stop high temps but very good for not putting parts under pressure. am running it in mine.