Looking at the Lenovo X1 Tablet (3rd Gen), it looks like the Surface Pro 5/2018 that we would actually want from Microsoft.
Features include:
8th Gen Intel Core i5/i7
USB C ports (Sadly no USB A but I can live with that)
USB C charging
Thunderbolt 3
Keyboard and Pen included
And even some parts are user servicable!!
I hope Microsoft is paying attention