Have you considered a one-time-use (or limited-time) PIN for deliveries? You could also replace your PIN-free pizza-guy mode with a fixed pizza guy PIN (say, 74992) that's similarly only valid for an hour.