I think the best way to add class limits is to use the three original class groups they made: Offence, Defence, and Support.
Add a 2 class limit to the offence classes (scout, soldier, pyro) and a 1 class limit to defence (demo, heavy, engi) and support (medic, sniper, spy). It's lenient enough to allow the standard meta, but restrictive enough to now allow for the ridiculous class stacking you see in current CompMM.
I mean yeah, it's not as perfect as just adding say, ETF2L class limits, but it's not as arbitrary as real competitive class limits, so new players won't get confused by the odd limits and also helps push 6's MM as an "offensive" gamemode.