the new i5 will be more powerful than current i7 with lower cost. prices are not going to be more than few $ difference. I mean 10-20 on the CPU and about the same as now (+- 150$) on MB.
As for your case, even with best custom loop, it would be extremely loud and probably will be thermal limited anyway.
Though the larger Shift X can be used with 280 + 120 radiators. you can do it with AiOs, but a custom loop would be much more effective as you can share radiators and use much better components. With custom loop it will be audible under load, but far from annoying.
And it's not that hard to do a custom loop. thy rarely develop leaks over time. I had not a single loop that leaked after passing 15-20 minutes of leak test. Doing this for...