i would definitely recommend getting a second hand ct20b from my own experience, they are a fantastic upgrade for a gen 2, nice and responsive, and they seem to last forever.
i used one on a gen 2 with some other bolt on upgrades and made 192rwkws @ 18psi, it was such a fun car to drive!