The T495s should be the solution for this but annoyingly they don't offer the 1440p screen like they do on the T490s (that can even go to 32GB of RAM).

But the an AMD X1 would be awesome indeed. The better chassis and 4K screen would make it the ideal machine for me. I'd love it if they did that in the Gen 8 but I'm not holding my breath...