Hello, Sullivan, and welcome to Piano World!
From reading your thread, it seems like you already have a plan in place, and don't need any advice!
If you looked at and auditioned the DH Baldwin (not a real Baldwin, as you mentioned) and you liked it, and the tech spoke favorably of it, you may enjoy it even more than the U1; not because it (DH Baldwin) is a better quality piano, but because it is a baby grand. If you can get it for $2000, that seems like a good price for the DH Baldwin to me, but only if you really like the way it sounds and plays.
On the Yamaha U1, they are very highly regarded, and very popular pianos, and they are excellent quality pianos, depending on the environment they've been subjected to and the general overall condition. You can actually get a "dud/lemon" with any brand or model.
Now, are you looking for a piano to play and enjoy, or an investment? If an investment, I'd suggest buying the Yamaha U1, by far.
So, in my view, it depends entirely on how well you like the DH Baldwin baby grand, and how well you like the U1. If you could get the DH Baldwin for $2K or even $2.5K or the U1 for $3K, if in good condition, that seems like a very good price to me on either. Again, the U1 would be the better instrument and the best long-term investment, but you are looking at a baby grand vs. an 48" upright. They are not the same animal, metaphorically speaking.
Good luck, and keep us informed of your decision!