We're close, except for my part I would allow for non-LEO's to carry anywhere an LEO can with a license. We've been there before, but I just do not regard a shall issue CHL as being an infringement.I advocate legal carry by anyone anywhere LEO can carry without a license. Absolute freedom and no infringement by states or feds.
The types of things that I have problems with are lifetime restrictions on non-violent felons and non-violent DV "issues". And FWIW, my own opinion is that even violent felons should be able to get their gun rights restored after some period of time - 10 years or something like that. If someone stays out of trouble for 10 years, there's a good argument that can be made that they have rehabilitated themselves.
Unfortunately, I don't see any of those laws changing any time soon.