It seems like you are asking for opinions. Here's mine:
If you are not having any problems, don't change things.
If you do change things, have a way to get back to original condition if things don't work out.
"A well regulated Militia, being necessary to the security of a free State, the right of the people to keep and bear Arms, shall not be infringed."
Life Member NRA
Life Member NAHC