Best to audition the speakers mentioned, preferably matched to an Onkyo 809 or similar model, then you choose based on your subjective preference.
The room is not that large, you can actually opt for a higher tier BS speaker + appropriate stands, then get a better subwoofer than what you have.