Doesn't sound like you have the time to remove the drive, because it's about the same amount of work as a battery swap these days. I went that route last time I

Doesn't sound like you have the time to remove the drive, because it's about the same amount of work as a battery swap these days. I went that route last time I needed a keyboard replacement under warranty. I don't think there's much else you can do except find a trusted repair person.