I bought the aftermarket kit this afternoon, but I'll take your advice and give Applecare a call tonight.Call Applecare. Often I've had luck even out of warranty when the problem is as widespread as you indicate. Just be pleasant as they have no obligation to help but generally I've never hit an issue where Apple didn't help me out. Worst they can do is not help you and you can go for an aftermarket fix.
Thanks.