Suggestions for my next upgrade

I would love to get some suggestions for my next upgrade.  I have between $2000-3000 for my next upgrade.  I listen to 90% vinyl and 10% digital music.  Most of my listening is folk, acoustic guitar, and classic rock, but I do range into some jazz and blues. 

My current set up is:
Cary Audio SL-100 preamp
NAD C-272 amp
Pro-Ject RPM 1 with Ortofon 2M Blue cartridge
Pro-Ject Tube Box S2 phono amp
NAD D 1050 DAC
Paradigm Monitor 11 speakers

The following is what I have been considering - although subject to change based upon items selling before my decision.
I am thinking to upgrade the speakers or the amp

The speakers that I am considering are:
Paradigm Prestige 85F - which are really pushing the budget
Contract Audio Black Moon - which I don't really know much about
KEF R900
B&W CM10 S2  - not a real fan of the appearance 

The Amps are:
PS Audio Stellar M700 pair - class D 350 watt
Quad Classic Monoblock - tube amp 15 watt
The amps couldn't be more different except that they are both mono block pairs.

Again, any thoughts would really be appreciated.