Yes, Garmin will fix everything wrong with your unit for a flat rate, but will no longer work on the non-WAAS version at all. That flat rate varies from $1500-2500 depending on your unit's part number and serial number, and it must be sent in by one of their authorized dealers. I'm biting that bullet on Monday (need a pitot-static/transponder cert as well) and will report back on how much it really hurt when I get the bill.
The good news is that the Garmin Avionics Tech Support phone service is excellent! Call 866-739-5687 M-F 0700-1900CST; I have yet to wait more than 30 seconds to be connected to a knowledgeable Support rep.