How do the Urban Infiltrator archetype and the Heresy inquisition work together?

Question

In Pathfinder, if an inquisitor with a negative charisma mod takes the Urban Vigilante archetype and the Heresy inquisition, does he still add Charisma to bluff, disguise, and diplomacy(per Urban Infiltrator) or is it just completely replaced with Wisdom only(per the Heresy inquisition)?

Urban Infiltrator:

An urban infiltrator adds her Wisdom modifier as well as her Charisma modifier on Bluff and Disguise skill checks and on Diplomacy checks to gather information.

Heresy Inquisition:

You use your Wisdom modifier instead of your Charisma modifier when making Bluff and Intimidate checks.

Answer 1

Officially, both work simultaneously, so heresy substitutes Wisdom for Charisma and then urban infiltrator also adds Wisdom—resulting in Wisdom being added twice, which isn’t allowed per this FAQ entry.

That FAQ entry has a lot of problems (being something written long after numerous options for doing so were, so it became a kind of stealth nerf—justified in some, but not all, cases. Also, the rules “interpretation” used is just flat-out wrong.), but it’s pretty widely followed. I suspect that most GMs, however, would allow you to ignore the heresy inquisition’s righteous infiltration ability if you really wanted.

Answer 2

An urban infiltrator adds her Wisdom modifier as well as her Charisma modifier on Bluff and Disguise skill checks and on Diplomacy checks to gather information

WIS+CHA on Bluff, Disguise, and Diplomacy (gather info) as written above

You use your Wisdom modifier instead of your Charisma modifier when making Bluff and Intimidate checks.

WIS instead of CHA on Intimidate checks. The character already uses WIS+CHA for Bluff from Urban Infiltrator so nothing changes there and gains both modifiers on Bluff as written via Urban Infiltrator.

If Heresy Inquisition modifiers are applied first then the Urban Infiltrator's rule on "...her Wisdom modifier as well as her Charisma modifier..." next wouldn't it overrule the HI one? As far I see it only makes sense for the two to coexist using this method. It's the only way to avoid the question of "Which comes first?" and still make sense.

Simplified:

• WIS+CHA for Bluff, Disguise & Diplomacy (gather info)
• WIS for Intimidate

If a GM wants to be more restrictive it could be ruled that Heresy Inquisition limits the ability score instead. Using only WIS for both Bluff and Intimidate. However, I find no RAW ruling on this.