Hey guys I'm in another dilemma which means...thread time

Okay so some of you might know of my "water plumbing issue". Basically my bypass system isn't working properly causing water pump to overwork itself, leading to cavitation and overheating yada yada. Bottom line is I need a Gen 3+ water outlet (and housing) and to rectify the plumbing in the engine bay. My radiator is an eBay special without the air bleed valve however it
works just fine. So my options:
- Minimalist: Buy second hand Gen 3 water outlet. Change hoses only what is necessary.
- Release the brakes: Buy Gen 4 (Beams) water outlet (brand new basically), change all the hoses that haven't been replaced and modify the radiator to have an air bleed valve. I already priced the water outlet for $250 :/
2nd route obviously more $$ but are there other underlying factors I need to consider? I really shouldn't be spending any more than needed but I do want the best for my baby so money isn't too much of an issue. Still plenty of stuff to do before Wakefield but I figured water and oil shouldn't be taken lightly!