For your option 2 line preference you could delay it for a couple of seconds before it picks a line giving the user the chance to make an internal call first

Option 3 yes it can be a pain but I can see why they want this.What if you were going to call a phone and didn't know it was ringing and had the DSS call pickup feature on?You'd accidentally pick up a call you didn't know was ringing.