We're are the same point except that I don't have any camera and that choosing is not easy considering the number of advices I got from everywhere. I finally choose the Nikon D50 with a Sigma 8mm Lense, as the fisheye has become useless these days (try to find a coolpix 8400 and 8700 and I'll buy you a pint of beer, Nikon has stopped the production and it has become impossible to find a new one on the web (at least in France)). So I have no other choice than spending about 600Euros (416GBP, 720USD) on the camera and bloody 700Euros (485GBP, 820USD) on the lense.
For the head, I have choose the Ninal Nodal 3 for 141EUR (98GBP, 180USD), it seems to do as good as magnos and manfrotto good but expensive heads.
With a good tripod and Panoweaver only, I reach the limit of my 2000EUR budget
I have decided to skip Tourweaver, because so far it seems that Easypano haven't decided yet the price of the future release in October, and apparently it will be more expensive than version 1.30 (this info I hope is subject to change).
It hurts to spend more thant what I planned, but I think I will be happy with the D50 and the sigma. Good luck and let us know your next move.
Nikon D50 - Nikkor 10.5mm - NN3 - Manfrotto055CLB - Panoweaver 4.0 - Tourweaver 2.0