Exact same problem here. Battery dead (the good old swollen battery bug) and x times a day: oops black screen, Magsafe came out again. In the end I made an aluminium tetris-shaped piecs and glued it to the side of the laptop, covering the Magsafe at one end so it would never ever come out again.