When using ccleaner make sure you run the registry cleanup. MS are really bad at tidying up after themselves after an update you will find loads of broken links in there.
As has been said earlier SSD is a must alongside a reasonable amount of RAM (So you dont page continually).
If you are looking for a new machine my favouites are Dells. Got four Latitides running Win professional, three Inspirons and a XPS in the collection. Also got a Lenovo which is OK but was full of bloatware (Thats another thing to check on the machine you have - only run what is needed not the manufacturers rubbish).
Last(small) company I was at I bought 170 HP's which were to replace the Dells - it was a cost thing. They were OK but not as good as the Dells (I kept my Dell and didnt swap to a HP) although the HP USB-C docking stations are excellent. If you get a new one try and go for USB-C.
If you need more space then look to buy cloud space. We have the M365 family that gives 6 people M365 with 1TB of space each. £79 p.a.
Couple that with LastPass family and you get a good all round system.
Hope that helps.