I'm glad you think so. Though, about an upgrade, I'm not sure I really want one of the newer MacBook Pros because of the lack of a battery door, although that seems to be my problem. Sending in the computer tomorrow for a mail-in-repair.
Update on the status. Got the machine back and it still doesn't fit. A specialist called me a few hours later and told me they needed three repairs before exploring other options so I think I'll send it in one more time.