You definitely want to look into speakers that are described as being musical . Some of the suggestions have been for those, such as Harbeth and ProAc. Focal are sometimes described as being analytical which is your trouble with the treble, I own them and found myself building a system to make them sound right. It worked- but mine were born oportunistically and a couple of notches up the Focal ladder. In effect, they were to good to throw out and start over well..... its a long story. You're smart to cut your losses and get what you want immediately or else I would be telling you to get this and that to make them sound good.
Good luck and no more trouble.