I’ve got the same model as you; and to be honest I’d get the bastard fixed. I’m not sure about the mac repair specialists in your area, but there are a few guys in Omaha, NE that I go to for everything, and could fix a problem like that in a jiffy for a lot less than you’d think. The remarkable things about Macs, and especially the MBPs, is that they have incredibly long lives if you care for them properly.
With this in mind, I personally wouldn’t wait for more than half a year with a gimp keyboard just for a body design upgrade. For some people, that’s really important, but it seems Apple’s focus has been on software lately, and there don’t seem to be rumors of any MAJOR breakthroughs in the hardware right now. If you can’t wait it out until their next release (could be anywhere from Jan - June of '12), go ahead and spring for a new one right now.
Get one now. The current MBP are way ahead in terms of hardware compared to any other laptops on the market. yes there is an update coming in the next yr, but like B Linus said it will more than likely be a cosmetic update more than a hardware update.
Its rumored that the new MBP will be very similar to the MBP Airs in design. If you really want o wait then wait, but IMO there’s nothing wrong with the current ones. I love mine and I don’t plan on updating mine anytime soon!