Without access to a fork crown cutter you will not be able to get the new 26.4 race to fit the fork (well, if you are really good with a file...). If it were my bike I'd put it together with the new headset but use the old crown race and see if it works.