This is the bill I talked about previously. The offending amendment (#2) has been superseded by a new amendment (#4) and includes language that will put the ISP in compliance w/ Federal Standards and they can get their money but w/o all the restrictions.
Full version here.
It is now being supported or at least neutral by the ISP, ISRA, NRA and IllinoisCarry.
No official news on CCW but it's not looking good.