your restored upright, go for the grand/baby grand route. i.e. if you're only looking for sound and play-ability, and money isn't an issue, you'll get better sound and better key action on a baby grand/grand.

However, if you have small children, or even larger reckless children, you might opt for a used upright until they are ready to share space with an expensive instrument/furniture and it would be less stressful for the whole family.