I've been mainly looking at the Swan MKIII's, Audio Engine A5+'s, Behringers, JBL's, and Adams. The other alternative is that 2.1 Corsair Speaker set. I'm upgrading from a Z-5500 set. I've realized 5.1 really doesn't work in mine or most people's desktop setup.
Right now I'm leaning toward the MKIII's. At first I was going to get the A5+'s but I've heard they sound boomy without a subwoofer. Don't know much about the rest.