Bob Corker hasn't ruled out a primary challenge to Trump, I think.
Bill Weld, while not exactly a consistent 2A supporter, has at least only been as inconsistent as Trump himself, and brings a more libertarian mindset.
I could get on board with Bob Corker.