I hear ya, doing it once and doing it right so you can make the most out of it for as long as possible is a good approach, but agree that the focusing on other areas so you can utilise it sooner is probably more important right now.
People tend to desire HY35's more than HX35's as HY35's perform better on single scroll manifolds, so it might be hard to do a straight swap. And if you would want to go down the route of a 1.5JZ in the future, keeping the HX35 and going twin scroll manifold (ie the Toyota version of what thebe has built) would be the better option. An HY35 + single scroll manifold (with the comparably more restrictive, single scroll turbine housing) isn't going to perform as well as an HX35 on a twin scroll manifold when you're fitting them to a bigger displacement engine, but they would perform almost identically on what you have right now.
Nothing stopping you advertising your single scroll manifold for sale, and if it sells then grab a twin scroll manifold and pay the difference. Can all be done while you concentrate on getting the rest of the car road ready