If you haven't already, I would urge you to try Ashigaru Wallet. It is a fork of Samurai Wallet that requires your own Dojo instance to connect to.

It has many of thesamee privacy enhancing spending tools (Paynyms, Stonewallx2, Ricochet) with the exception of whirlpool.

If you don't run your own Dojo, there is a list of nodes from the community you can choose from to connect to at dojobay.pw

#FreeSamourai