Re-partition from scratch, load whatever OS (s) you want and restore data from backups. Life is too short!
You have got backups, haven't you? Please say you didn't start out on all this crap-cleaning and re-partitioning without taking the elementary precaution of backing up your data?
Salutary lesson time.
SD