I'm in the same boat.
I've now a Thrusmaster T16000 which has, in my opinion, the best "quality versus price" aspect of all the current joysticks (this thing is so precise)!
And I plan to buy soon a CH throttle.
http://www.amazon.com/CH-Products-Pro-Throttle-USB/dp/B00006B84Z
A bit pricey, but not too much, and lots of buttons :-)