new speakers for studio? Salon 2, Wilson....

I am wanting to upgrade my recording studio monitoring situation. I have a Krell 300 si integrated into some Revel M20 monitors and a REL sub. I'd like to get something significantly more revealing as hearing everything is best case scenario for mixing and mastering recordings.

The room is 15x19x9 and has a 6 wide opening on one wall into another room about the same size. My gear is all situated in the middle of the room. Now I have the M20s about 7 1/2' apart and sit about the same distance away. I have the freedom to move the speakers anywhere from really close to the wall to maybe 5' into the room but that will get them pretty close to my ears. Ideal would be closer to the wall and further apart. I am listening sort of near field now. Not sure how a big speaker like the Salon 2 would sound listened to close as 7'. Reviews seem to say that the drivers blend very well. I like the idea that they have a boundary compensation adjustment for close to wall placement and even a .5DB tweeter boost or cut. Not sure if I am thinking to big for such a room. I just want something very transparent and will be very revealing. Revel Studio 2s look good too as well as I have really liked almost any demo I've heard with Wilson speakers.

I would consider upgrading my amp as well. I was hoping to be happy with a class D amp as I'd like to be able to leave it on all the time without running up the energy bill or heating up the room.

I've have Dynaudio C4s in my living room and the bit of mixing I've done on that system tells me I need something significantly better in the studio if I am to make the right choices in my mixes.