They shouldn't be changing encounters to this degree just to accommodate for NPCs.

If they cannot get it to work with NPCs, then they simply need to work more on it before they release it.