Don't forget to look at Z1. Their kit is pretty cheap, uses Setrab cores (19, 25, or 34 row) and SS lines. Also Z1 are huge supporters of the Z community.
What are your temperatures running now? Most of the time on the street I run around like
this (pic) because my 25 row cooler does too good of a job. Great on the track but I'm afraid of what it will be like in the fall/spring.