Number 2 (edging) is certainly called for, if done slowly and methodically, making sure it gets intense enough for him to start bargaining and begging; But it can be combined with making him wait. And wait between edgings.