I received my 500 back from Sony and all seems fine, though I'll have to wait for the store upgrade to be sure.
Heads up to those waiting on getting their 500s back: Sony requires a signature for UPS delivery (at least they did for me).
Fast turn-around and a free upgrade to a discontinued product - no complaining from me! Thanks, Sony.