I had a 2004 Fuji Newest frame warranty-replaced with an '05 Newest frame. Among the changes was a switch from the recessed headset style to the... umm... non-recessed style. The new headset (pressed into the head tube, it looks like) has the following issues:

- The new frame didn't include the "convex hollow alloy 25mm spacer." Because the old frame had the oversized head tube for the recessed headset, the OD of the old convex spacer is too large, and seems like it would funnel splashed water into the headset. However, it seems like leaving the spacer off would just invite water/contaminants in from the top (since the OD of the headset is larger than the OD of the headset spacers). Where can I find a spacer like that?

- I have an Alpha Q EX fork. The crown race that's currently on it is too short -- the wide, flat, lower part of the race butts against the outer, non-rotating part of the lower headset cup. However, the crown race on my old fork (damaged in shipment, hence the Alpha Q) seems to fit perfectly. Would it be possible for an LBS to remove the too-short one and replace it with the one from my old fork? Could I do this myself? (I don't have any sort of headset-specific tools, though I have enough general tools available that I can probably rig something up if I'm sure I won't hurt anything).

Please, please help if you have any suggestions for either of these questions; I posted on the Bike Mechanic forum 20 hours ago with no responses, so I'm hoping it's just that they're more roadie-oriented questions.