The only tweak needed in my humble opinion would be to HB 5902. The use of the word "display" has given over zealous police & prosecutors just enough wiggle room to bring bogus charges in the past. It is too subjective in my opinion. Maybe use to unholster or handle unholstered in a threatening manner instead? Sadly, some LEO's & DA's have become masters of wordsmithing, so the law needs to be so clear it cannot be abused by them.
Just my 2˘ - YMMV