Well, we're back to a "no ETA at all" situation - the rep I spoke to on the phone this morning was very nice and courteous, but she said the Ricoh rep she spoke to recently was not able to provide any information at all. Typical.
I asked for my camera back, and she volunteered to check out whether I could hold my place in line or if I would be dumped back at the end. Either way, I said, as long as I eventually get the upgrade I'll be fine.
This is a really dumb and entirely self-created fiasco.
Because she was nice I didn't want to get into the "but why haven't you contacted us about this" complaint. Another time, maybe only after I get my upgraded camera back!