Hello,
My personal advice would be to find a nice used quality grand. Assuming you have the space for it and don't require an upright you are much better off with a grand. I myself purchased a beautiful August Forster grand (5'8") for the same money that you are looking to spend. I am going to have some work done on it over the next few years but, for now it is suiting my needs just fine. I really feel a big difference in the way a grand plays as opposed to an upright. It has made a tremendous difference in my playing. Hope this helps, good luck, Jim