2. set petautocast for leap off when you pull, and turn it on after your first hit or two. this is especially useful if you pull with a deathgrip, cos deathgrip+leap is a bit of a waste.
You could just use /pet passive or whatever the command is called for your deathgrip hotkey, that eliminates the micromanagement of leap. Ofcourse you have to use /pet defensive or whatever for your attack macros after that.