Thanks for the advice. Starwood made this choice easier for me. I called to ask if they would match the Hilton challenge, and they said that they couldn't for Platinum, but that they would just comp me Gold then and there, which they did

So far I am very happy with Starwood.

Thanks for your help.