Why Pun-Pun Doesn't Work

[lesser_minion]

My idea was just to have it allow a Will save in my campaign. A simple enough fix.

That's not really enough.

In theory, you could have all creatures called on the same basis as a unique creature, instead of being automatically under your control.

The 'three wishes' thing is really better handled by removing the spell-like ability (or, possibly, limiting it to a single wish with the safeties removed), and instead have the 'three wishes' thing conveyed by having the efreet perform three services.