Spoke to my dealer. He said that the software fix should be to them by the end of the week and the heat sheild in next week.
So a little more wait, but the light is at the end of this long tunnel.
BTW, unrelated question. Before losing their 5, did anyone else see this problem? Under the gas...