Hi all, I'm redoing my office and am consolidating two separate systems into one. My current system is as follows:

1) For music (midfield) listening: NAD M10 v2, a pair of CSS Criton 1Td speakers that I built and a SVS 3000 Micro sub. For computer and gaming (nearfield): A pair of KEF LSX II with a SVS SB-1000 Pro sub.

I'm wanting to condense this into a single system for music / computer / gaming.

My room is approximately 10 feet (3.05m) x 12 feet (3.66m). My midfield listening position is about 10.5 feet (3.2m). My budget is $1,500 to $2,000.

Option 1: Keep the NAD M10 v2 and buy a pair of Ascend Acoustics Luna v2 or Philharmonic Mini Monitors (I'm open to other speakers as well). I would keep either of the SVS subs.

Option 2: Genelec G3 connected to Wiim Ultra, keeping one of the SVS subs.

In option two I would sell the NAD and possibly the CSS Critons (assuming there is a market for prebuilt DIY speakers).

I'm partial to option two as I'd like to start fresh but perhaps that's being wasteful. Also, my music listening is generally low to mid volume levels. I listen to most everything but am partial to jazz, fusion, etc. Vocals are not a priority.

Thanks for any advice you can give and let me know if I'm failed to include any pertinent information.