One other option to consider is the upgrade to 5.1.5. This would give you a clean version of Adwaita.
But also now that you have started experimenting switching Themes, there are many options available.
And this discusses my attempts to create my own theme with some additional links to other themes.