Thanks for the responses. I do still have the stock deep wheels on it. They are pretty deep even a 48mm stem barely has clearance.
Out it of all these suggestions which ones would last longest with some heavy riding (well I suppose probably light compared to others on this forum) about 100 miles a week if I can get into the shape to pull it off. Anyway would it be wiser to spring the $400 now or go lower?
Additionally if it is the headset and forks how can I fix that? There doesn't seem to be any play in them when I check it. If I can manage a month or so I can upgrade but this bike has a decent groupset.