@raagamuffin and @brdwyguy on the question of upright vs grand.... I am one of those people who prefers a grand even if it's smaller. I know the arguments for "a good upright is better than a small grand" but there's something emotional about playing a grand. And I say this as someone who had three digitals and three uprights (not at the same time! ) before getting my current grand piano.
Also, I own a 5'8" piano and was originally planning on getting one smaller than that, so I just don't worry about the trade-offs of a smaller grand, because you get that emotional experience of playing a grand....
Now having said that, if @raagamuffin is willing to consider an upright, then of course there are all kinds of great uprights to get, and that is a different conversation...
BTW, raagamuffin, when you are measuring out your space, I generally recommend people add 3 feet from the edge of the keyboard to where the back of the bench will hit. This allows a piano tech to remove the action, but it also allows a pianist to sit a reasonable distance from the keyboard. So be sure your space allows for that.