Good thought. But it sounds more like a vacuum leak somewhere else to me, as it should be able to keep running on what comes through the bypass valve.
Have you tried disconnecting (and plugging) the line to the brake booster? It's an often-overlooked possibility for a vacuum leak.