m15 R6, battery issues

I'm having some issues with my battery and I'm trying to figure out if it's software, drivers, or hardware. Some background is that previously I was having a documented issue where the laptop would get "stuck" in sleep mode and need to unplug the battery to force turn off the machine which was resolved by a system repair. I also had to replace the power adapter port, which I did through Best Buy and they actually damaged and replaced my screen and keyboard, so I'm worried that the hardware was further damaged in that whole ordeal.

For a while, my computer has been shutting down whenever unplugged (unable to access battery power), but the battery was showing up normal and charged and battery health checks were coming back normal. Now, the battery is not showing up at all under the taskbar or individual components in SupportAssist. Any time I try to disable or uninstall the battery driver in device manager I BSOD. I've tried a system repair upgrade but that did not solve the issue. Has anyone had any similar issues or recommendations for troubleshooting?