From what I've seen hanging around here on iFixit for some time now, it seems that the two things that get affected the worst by water damage are the screen and the battery. Given that you're seeing weird behavior associated with the screen plus the fact that you know there's been previous water damage, I would suggest that replacing the screen might be the next step. If it was me, I'd probably take the opportunity to swap out the battery at the same time.