Well your VoC is 22.4v so with your 2s/3p setup you're running 44.8v and 28a to your controller. Even if you rewired it up to be a 3s/2p setup you're still well within the voltage range of pretty much any decent MPPT controller. The only issue is that most controllers are limited on how much panel they can use for a given voltage based on the amperage rating of the controller and the voltage.
For example, say you picked up a 60a EPEver or PowMr or something controller. The 60a is what the controller can pump out to your batteries, so if you had it connected to a 12v system, that would be 60a X 12v = 720w. On the same controller running the 24v system you would get 60a X 24v = 1440w. So on a 12v system you're over paneled (which is fine because reality and data plates are 2 different things) and on a 24v system a little under paneled (which again is fine as you're not trying to do a full charge in 1 hour) so either way you're good to go.
MPPT controllers like having higher voltages to play with but all that really matters (unless you're trying to eke every single watt possible) is that your VoC is a few volts higher than your battery bank voltage.
As for which one to go with, the cost difference between a 40a and a 60a is so small you might as well go larger to give you more expansion room in the future. Over 60a they tend to get more expensive per amp so IMHO the 60a SCC's are the sweet spot. EPEver, Victron, BougeRV, all sorts of good brands. Ones to avoid would be Renology, EcoWorthy, or MakeSky. Find ones that fit your budget with the most amperage rating available and any features (bluetooth, wifi, disco balls, etc) that you want and has good ratings, and go for it.
Also, there's really no such thing as a "12v panel" or a "24v panel" it's just a marketing term that lets you know what kind of battery bank you could theoretically charge with it. A "12v panel" would charge a 12v battery, but wouldn't produce enough voltage to feed a 24v battery. The VoC is the actual numbers you want to use when calculating for arrays and controllers.