Ben: I think that entertainment system will fit your needs well, and without crowding components. Those routers are invaluable, aren't they? Hope you either repair the one you have or replace it with another. Is someone going to help you set up the entertainment stand? It looks heavy, even if it can be separated into modules.
Your Onkyo TA-2058 should give you more than a few years of reliable service. So, $117 is a good deal, after all.
Nando.