I ended up bending a rim so badly that it couldn't be repaired (yes, alloy rims can sometimes, perhaps even usually, be repaired at ~$160 a pop). The dealer ordered a new rim (at about $960[!!!] including mount and balancing) and hopefully it goes on tomorrow. Hopefully that will cure the vibration I've been having.
I got a nice one (one small area of curb rash) off Ebay for $200 to use as a full size spare. If going on the care full time, I would have had the rash removed. If you watch Ebay and Craigs List, you can occasionally find them; nice to have a matching spare or just a spare wheel in case of problems like above.