wow
which one do you like better? 
Well one is a grand and the other an upright, so its apples and oranges really.
The upright is a Kawai BL-51, which is good for an upright, but it is an upright, and I don't play it that much (usually only when I can't use the room that the grand is in).
The grand is a Yamaha C3, and it is great, would recommend. It has a very good dynamic range, and can be quite powerful for its size (6'1") (bit like me really

)
I am toying with the idea of upgrading to a Yamaha C7, which are heavily discounted here in the UK and in Europe, and at around £17,000 and 7'6" should be the next best thing to what I would really like (a Steinway D - Hamburg of course

)