I too am an advocate of open carry. One liscense should do for both. Call it a "Liscense To Carry". LTC.
Best is to let the 2A stand as it reads.
If someone is a fellon & has one on, arrest them & send them back to Huntsville State Penitentiary instead of "housing them in Texas Dpt of Incorrection. Sarcasm intended.
LT