Okay, bike is at Beach Yamaha and it seems that my Western Service Contract (3rd party warranty) will cover it or most of it. The part is being airmailed out today from the East Coast. According to two yamaha service managers, there is no way to ensure key compatibility with the new lock. I did take the key code with me and the service manager did call Yamaha. It seems that Axeman just got lucky on the key match. As to the 2007 part, I did not see this post prior to getting out the door or I would have done so. I have requested the part back and will provide pictures.
As to the NHTSA complaint, I filed one this morning with all the details that I had at the time. Like Don has said, I am not trying to bash Yamaha, but instead trying to warn forum members about this problem. Someone will get injured as a result of this. It just hasn't happened yet. Yamaha should do a service update or a recall in my opinion. They will protect themselves in the long run.