Core pistoliers would have to not count towards minimum required units. As should other fast cav and skirkmishers. Besides that, I think they should still be special. But I do like your idea of upgrading state troops. Maybe give them the option to also take a GW or FP. But if they take FP they can't take a shield?