I'll always chose zone 17 too, because, albeit rarely, some new drivers for whatever reason seem to have a challenge navigating the Int'l terminal. Sometimes, they'll drive on the side closer to the terminal, and at zone 17, I can waive at them and easily cross over to catch the ride. It's happened to me twice.

Also, use both Lyft and Uber, and choose the one with the lower price. During those times when there's a surge, if I have the time, I'll just sit inside the terminal, pass the time by catching up reading FT, and the surge will return to normal pricing in about 15 or 20 minutes.

If given a choice, I'll always opt for the Int'l terminal for pickup, since I still have a little trouble navigating the underground or dedicated parking lot areas.