If you are not afraid to experiment with some more advanced tools, AOSPMods has options to set the number of quick settings rows and columns, which worked well for me. (I was initially annoyed by this change as well, but I eventually got used to it.)
Lots of great extensions have been listed already, but here’s one that I haven’t seen mentioned yet and I really like: https://unhook.app/