Thanks for the offers, folks! I just ordered the upgrade from NSM.com, and I've talked to the dealer about getting the old one covered under warranty. I figure I'll just hock the new one on ebay or something. *shrug* I do know that I don't want to wait around for the warranty to do its thing, especially if i'm gonna replace it anyway.
I do know I ain't gonna do this again. Glad to hear the upgrade is worth it!

--Jaeger