more or less yeah
split the categories up between offensive and defensive mons similar to what you did with boosting sweepers (sd, np, cm, etc)
as for the c/ped entries, i mean the way i see it if the sets are still worth posting they'll be posted again anyway, but i'd talk to a mod since there are a lot of entries