I'm completely the opposite on DitD & BT. I find Digging brilliant live. If I were going again I'd hope BT was dropped to help de-emphasise the focus on So among the older selections. It'd be good to see something else from 1 & 3, and anything at all from 2 and 4.
I do agree with you about the emphasis on So.
If my daughter wasn't going I'd be right there with you. Honestly if I could pick one it would be On the Air-I think it'd be a great song to play in this tour!