Yup, replace the switch w/ a 16 port and let it do the switching vs the router. You could stack another 8 port but it'll be cleaner w/ just a 16 port.

Plug one port of the 16 port into the router and you'll be good. If you get an unmanaged switch, it won't be too expensive. Don't get a hub.