Replying to
@tinker@infosec.exchange quite agree with you. A good alternative is to host your own vpn for the second case.
There is guides on algorithms that are quantum resistant for this cases. I hope this helps
"Have no friends who are not your moral equal" (Confucius).
What a polite bird