i highly doubt a keyboard swap. its new hardware all together and that wold be a loss to them...If they do change the hardware on the droid I wouldn't see why they wouldn't allow for a keyboard swap. With that said unless its a huge noticeable difference iit may not be worth it. With the low clearence between the screen and the keyboard I do not know what they can do to improve the keyboard to a point where it would make a difference.
kinda like with RIM an the BB Tour. The essex is coming out soon and the only difference is trackball to trackpad and they definitely wouldn't do a swap.