I guess my main problem is I can't tell what year they are. The only reason I even care is warranty and resale. The sticker on one wheel says "CONTROLE 2004."(i thought it might be a French QC sticker,but maybe the 2004 is just a inpector #) There is a 2004 date in real small type on the manual, but that might not change every year??
Some of my problem may be the web sites I have been looking at may have wrong pics. I have found pics of both 07 and 04 that look like my rims, right down to the composite front hub and yellow hub stickers.

The shop is not open again till tues, but I will call. I spent hours there on Sat and they seemed like real nice guys, they even got me in on their lunch order. They spent more time trying to get me in the right shoes than my own shop spends selling a bike.

They did not seem like the type to rip you off!!, but maybe they were real good!