NPC spawn and behaviour system might need a rework that might be impossible on current engine. Devs could make NPC patrols spawn in more predictable zones and patterns (and farther away, probably) while leaving a possibility for random server-generated events.
This way NPCs can be taken out of the way by leaving regular patrol zones.
Oh, and they should be buffed afterwards. Stop worrying and love the proper PvE.