Like this?


Looks pretty good. The only optimization I would suggest would be to remove the Linksys altogether and just plug the upstairs computer directly into the router.

What scenario is causing you pain?