Droped My S6 in some water :(

[DrLine]

So about a 4 months ago I dropped my S6 in some water. It was only halfway submerged so the Liquid Damage Indicator never got tripped. When I turned in on it was overheating so turned it off. When I got home from the lake I put the phone in rice for a few hours I was being very impatient and took it out. Some of the bottom touch buttons we not working. So I put it back in some rice for the night. It worked from there besides in not charging fully almost every time. Then few months later I started to get Battery overheating problems, I would let it sit for a few. Then charged it for a few. Then it got worse it would only charger like that when it was off. It wasn't a huge deal because I'm not in school so don't go on my phone to often besides Pokemon Go ;). Then it said I could update to Marshmallow, so I did. 30 seconds into the "new" Android it said my phone was overheating. So I did all the steps to "fix" overheating the last step was factory reset. After that my phone was overheating from all the google apps it had to redownload. So now it is just overheating randomly and the battery is still overheating when charging. So I don't know if I need new battery, new micro usb port or some other thing fix. I keep trying to do research but keep finding different things.

[dizmo]

I'd just get a new phone. That one sounds toast.