If you need a hybrid, go with al_net77's recs.
If a Digital Upright is sufficient, due to excellent keybed action (better than a standard acoustic upright actually, and almost as good as an acoustic grand!), and really good digital sounds will be used from the digital piano vs. triggering (or re-tracking later) a computer based piano source, then the top-end Clavinova and Kawai CA-series are the best bets.
I'm torn between them myself, having just played Yamaha's CLP685PE recently. It sounded great on headphones but I frankly didn't care for its built-in speaker sound, so I want to re-try the Kawai CA-98 and if possible compare side-by-side, as I was VERY impressed by what Kawai had done with the soundboard and Onkyo electronics on their top model.
The CFX in the CLP685PE is really good and quite versatile. For some reason, the Bosondorfer sounded muffled, dark, and inarticulate to me, which is kind of weird for a brand known for being super-bright and aggressive. The keybed felt like a high quality grand piano. Can't remember if Kawai's is as good.
The finest GrandTouch keyboard and sound system combine to give you the ultimate grand piano experience.
usa.yamaha.com
The Shigeru samples in the Kawai's are unique, not found anywhere else (even software), and also top-of-the-game, but I don't have a strong enough aural memory to compare as there was a six month gap in trying them at different stores. I think the Kawai dealer also carries Yamaha, but not the other way around, so I'll return to the Kawai store soon.
Global Website of Kawai Musical Instruments Manufacturing Co., Ltd. | Products, Company Information, Brands, Investor Relations, Environment, Recruitment
www.kawai-global.com
Prices are fairly similar. Yamahas are on sale right now, which may mean new models soon, as it seems the Clavinova have often been updated near end-of-year. Probably also true of Kawais.
You may also find the MP11SE from Kawai to be sufficient. Probably exactly the same sounds as in the CA98, very similar keybed (if not the same, in the revised SE version), but missing the specially designed wooden soundboard that helps with realistic three-dimensional sound in the room (if that matters; not sure if you're miking or going direct).