Here's What I'd Do If This Were My House

No upgrade needed.

Your setup is in good shape.