Is the diverter valves the same for the 997.1 and 997.2 turbo ?

So the Agency power 997 ones are not the right ones for my 997.2 ? I can only run the Forge “008pa” whatever they are (sorry I forget the exact part numbers)

What is everyone using for upgraded diverter/by-pass valves? Forge tells me 6 week back order. I live in Canada and that puts me mid to late October to even go stage 1 and there is no point till spring at that point because the weather is unpredictable in October