So an update!
Finally had the time AND inclination to start to tackle this. First I opened all the easy panels etc. and cleaned it out using compressed air etc. checked the battery over and ran multiple good anti-malware and virus scans.
Then since it is an Hp Laptop, I dug around till I found the right boot up shortcuts and forced it to reset to it's semi-hidden partition. It is the equivalent to a full wipe, factory reset and re-install but Hp provides it on all their laptops. Made my life much easier.
After that I made sure everything was installed again and running and did some general tinkering.
Battery now works and has about 8 hours life in it, that is an 8 hour improvement so very happy. Internal fan is working properly again! It starts up quickly and runs things properly now!
The final issue is still that it can overheat. It only overheats now if I play a more complicated game on it and stress it a bit but I haven't gotten into the guts of it yet for a full clean out so there is a chance that can still improve too, it's just damn hard to get fully into this laptop...