Reboots after water damage and it takes hours to turn back on.

I have looked for info, but I cannot find what I am looking for.

I dropped my iPhone 4s in the pool and it was recovered very quickly. The phone was put in rice right away and the battery has been replaced. Since the swimming events of the phone it will reboot itself and take hours to turn back on. When it is one, the phone works great and does not seem to have any problems. However, once it auto-locks itself, it will start to reboot and sit with the apple logo for hours. I have been able to bypass the auto-lock feature and the phone will stay on without any problems. The phone will work fine when it is on the charger and it does not seem to have a problem with the auto-lock when it is on the charger. I am fairly certain that there is a short somewhere in the works, but where I do not know.

Does anyone know of a fix for the rebooting problems once the auto-lock goes on when the phone is off the charger?