Ugh, baffle in place and egr still doesn't want to make the car stumble.
With not being able to get the engine to stumble/stall, I would check all of the plumbing and ports, with it barely passing yrs ago, the problem may not have anything to do with the new cam, the way you found the vsv connected to the charcoal canister, that could have been done by the PO or helpful smog tech to get it to pass.