Another "Help me choose my speakers" thread

Just looking for some suggestions on upgrading speakers for a 2 channel music setup.

I'm currently using a Marantz 2230 and I plan to keep it around for awhile.

My room is rather small, 11.5ft x 9ft, 7ft ceiling.

I listen to jazz, rock, and bluegrass inspired music.

I won't spend more than $1000 or less than $500

I have been reading many forums and just about loosing my mind with indecisiveness. Some of my considerations have been floor standing, like the Klipsch RP-6000F, Wharfedale Diamond 9.6, or the Fuance Signature Series. Some have been bookshelf,  like the Martin Logan Motion 15, Wharfedale Denton, or the Focal Chorus 706. Any suggestions would be appreciated!