I would choose the Baby Grand if you have the space for it. The regular tune up's it requires are well worth the reward of playing the real thing. It is more than just harmonics, it is the temperament, hammer hardness, action, feel, resonance, and so on - even though the physical models and new high tech stuff that goes into the new TOTL Digital Pianos, they still cannot capture the true essence of the real thing.
But hey it's your home, and your choice.
DocZ