Yeah I followed the same path. I originally switched from npm to Yarn 1 for the speedup, but then Yarn 2 broke enough things that I never managed to upgrade.

pnpm is (at least) as fast as Yarn 1, and they managed to do it with a much better compatibility story (in my experience)