I did the same, turning off all AI and smart features (including those Primary/Social/Promotion tabs) made Gmail so much better.

I'm planning to move to another service provider though. I can't trust Google anymore.