I fixed all my shutdown and reboot issues by stuffing a piece of paper behind the battery so that it presses on the contact leads more firmly. Kinda reminds one of the old creaky Nokias that could be fixed in a similar way to stop creaking.