So I'm returning the wrong headset from Amazon, and I went ahead and ordered a proper one that will fit (and is about half the price). Also Nashbar was running a 21% off sale yesterday so I ordered another fork for about $40 final shipped cost. I think I'll make out okay. If it turns out not to work I'll return the parts, or try to sell them along with the frame.