Will replacing my liquid damaged top case fix my issue?

About two weeks ago I accidentally spilled soda on my MacBook Pro. I did what you supposed to do when that happens and turned off my MacBook and disconnected the battery and removed the logic board so I can clean my MacBook and let it dry. The logic board didn't have any water damage on it. I waited about a week later and put everything back together, but when I power on my MacBook Pro it'll stay on for about 30 minutes to an hour then it will force shut down on it's own. When that happened I went and reset the SMC and PRAM, but the issue still happens. One thing I did notice was when I have the lid down and the MacBook is in sleep mode it'll stay on until the battery runs out. I'm assuming probably an issue with the power button, but I'm not sure. I'm thinking about replacing the top case along with the keyboard. Would that be the best solution to my problem?