You're on the right track - just keep listening and find brands that you like. Take your time and make sure that whatever you buy, you will be able to return if they don't sound as good once you get them home.
Defintives seem to have pretty strong opinions one way or the other - really love or don't care for at all. Now that you have a baseline with something that sounds good to you, try some others.
I have had good luck with NHT and Kef speakers over the years and still have them. Paradigm is another brand that I like. And I am really itching to try some of the Onix series of speakers from
av123. Something like the x-mtms for fronts = $450, x-ls for rears = $220, and an x-cs for the center = $140. Toss in an SVS or HSU sub, and even with shipping you will be well under your $2k budget.
The only drawback to the Onix speakers is that the mtm's will be expensive to ship back if you don't like them, and they are backordered on them right now. However, all indications are that they are a great package.
Another thing to consider is that the majority of sound comes out of your mains and center. If a new set of surrounds is pushing you over your budget, don't be afraid to pick up a used pair for now and upgrade them down the line. Buying used gear is a good way to get into things you otherwise wouldn't be able to afford. The return policy is generally non existent with them though.