Not saying I agree with the idea, but it does codify what the situation pretty much is in reality. A PAT is about as "automatic" as it can get (fails less than 0.5% of the time), so just treat it as automatic unless the team wants to try for 2.
The net result will be pretty much the same.
Then just back them up to the 20 instead of the 2. Or the 25.