I feel like just using containers in the first place to separate your identities would solve multiple issues. Not sure if you have used a browser that has them, but I think on Firefox it works quite well and is easy to use.