Hi Pete Hope the new plan works. Unfortunately I cant offer any advice. My set up (still the same as when I bought the car) is as your OEM diagram (but now with no jiggle valve as im running jenveys) but with no stat. Works well, doesn't over heat, when it gets to 80 it stays there (road or track), only draw back is on cold days it takes a while for the water to reach 80, especially on the road. Just made up some grill blanks to see if it speeds it up :o) Cheers Darren