AJ, what about the Roland EXR 3/5/7 "s" series? The 5s and 7s look very complete and the Roland keyfeel is better than Yamaha. You'll also have a different sound source in Roland.
http://rolandus.com/products/details.asp?catid=8&subcatid=39&prodid=EXR%2D5s