Upgrading Equipment

We are long-time satellite customers with a 10 year old HR44-200 that is still working albeit a bit slow at times, with 3 wireless Genie minis and a wireless video bridge.  Today when I logged into my account I got a popup about getting a free Gemini device which got me thinking perhaps I should look into upgrading the HR44.  

I hopped on a chat and the chat agent advised that since our setup is a surround sound system wired to an A/V closet with A/V receiver and the HR44 that moving to a Genie 2 HS17 and a new wireless genie mini might be our best bet but will put us back into an equipment contract.  I've been reluctant to upgrade HR44 because of not wanting to get back into any agreements with DTV Satellite but my husband doesn't want to strictly stream.  So my question is what would others recommend as best course to upgrade equipment in the house?  I also have one of the original Osprey (Gemini) boxes from the beta testing days that I was able to get updated for satellite use but I wasn't able to get it connected as a client unless I contact DTV to do so.  Would I be better off upgrading to a Genie 2 HS17 hooked to a wireless Genie mini or to a Gemini device if it is housed in an A/V closet on a second floor?