TNC and N are both considered better than BNC. Worth looking if you are swapping anyway.
Note that UHF are not in my consideration there. I also plan to begin removing them from my shack as I can.
Swap one pair at a time so you don't end up with a shack with no connectors and no way to get on the air.