My RES was doing the exact same. We actually just decided to clip her claws and we haven't had a problem since. It didn't get to the point of actually springing a leak though, so I have no advice about the new tank.