Choose contact name manually?
As always, it's a different Android device (but same Android version, however) so YMMV...

The Samsung Vibrant (aka Galaxy S) has a Mark as default menu option when you open a contact.  If you have more than one linked contact (with different names), it allows you to select which name appears in the contact list.