Yes. Samourai Wallet understand this problem and is probably the Dev team that has worked the most in improving the privacy of the Bitcoin transactions with clever features like running over TOR, StoneWall, Ricochet, PayNym, Batch Spending, Cahoots (a suite of tools to create and handle collaborative peer-to-peer CoinJoin transactions between two wallets) and Whirlpool, and as you mention, now working on atomic swaps, but the feature is still under development, they have posted in X few videos showing that a beta version is already being tested and functional but nothing for the public yet.