I think that's right. The Armstrong bikes were works of art created and donated by the particular artist. I assume Trek simply donated the canvas . . . er bike as part of the cause.
As for the wheel situation, who knows. At this point, I really don't care. JB and LA did a bunch of crap to get under AC's skin and it didn't work at the time. Hopefully, he drops it because he's going to have the entire RadioShack team, plus several others gunning for him. He's going to need to be stronger than he's ever been. And frankly smarter. He would do wise to make sure that Vino, Zubeldia, Navarro and others are in top form coming into the TdF, because I think he's going to need him them more than he realizes.
I think there was talk of it, but it seems like this year, more than any other year, there was a ton of misinformation or rumor conveyed as fact with respect to transfers. As far as I know he's riding for Navarro--but this is Astana (or Samruk-Kazyna) so anything could change in a moment's notice.