Okay, after reading through this thread multiple times, I have a better answer for you.
Your two use cases are to use a VPN and Tor, but the root issue is that the two activities are centralized together on your client. Therefore, a more sensible approach is to separate the two activities to prevent any confusion regarding configuration and purpose. For example, you can use server B for general privacy with strong performance, but when you want to use Tor, use Tails on a USB drive for that explicit purpose instead, or Qubes-Whonix, etc.