Do surface segments now count towards 20 segments?

Yes. And sadly it also includes land travel between two ariports in the same city. There is no "co-terminal" waiver.
Which is particularly frustrating if you want to go anywhere other than BA in Argentina, because all Lan Argentina domestic flights go to/from AEP, whereas all international flights are to/from EZE.
So you end up with two wasted "land segments".

There are probably other examples too.

Happy Travels.