Go with the sound you like...
You found the Adam's harsh, then that will not go away...
I am in a sortof similar situation... I am looking for a nice 5.1 setup for my living room.
I had it narrowed down to the 8020/8030, the Dyn Bm5a's or the Adams.
I haven't heard the Adam's yet, but I found the Genelec's harsh compared to the Dyn's. (Also I got a pair of BM6a's so I am familiar with that sound).
The difference is logical, metal tweeter compared to a softdome tweeter, though found the imaging in the high end on the Genelec's very good only a bit harsh to my liking, but you could also see it from another point of view at least you can mix the high end carefully on these, but I am not sure my ears will like me for mixing on those speakers. Even on the small 8020 the high end imaging was great, but they were too small for my living room and too little low end, even paired with a sub there was a too huge hole in the spectrum for me. (could work in very small rooms though)
Haven't heard the 8040's but as they're a step up from the 8030's I suppose they must be pretty good. Read on GS a couple of times that the 8040
walks all over the 8030
, and I found those already good.
I have still not made my decision... looking for other alternatives too...