4000$ US will get you a very nice Yamaha upright. If you want good sound, go for the taller ones.
If it were me, I would pay a little more and try the Petrof uprights, which feel really nice, but for your purposes (eg. rock, jazz), Yamaha will do just fine.
Preferences differ with each pianist. Do your research and see what suits you best.
donjuan