Don't know if it helps at this point but, you could always look into grabbing an owned D10, D11 or H21. If you have an HR20 and are looking to upgrade it, you could put it on the deck. The HR20 is no longer recoverable by D* so you could turn it off whenever you want and you won't be required to send it back.
Streaming to a new nsz-gs7, not my Nexus, and it's great so far.
Interesting about the HR20, I have two that I'd like to eventually get around to upgrading, but didn't want to lose what I had on them. Not having to send back makes that a bit easier.