I agree with OP, Switch XL/Pro that offers current docked performance (resolution and frame rate) in portable mod and higher docked performance than current in docked mod. Tegra X2 would be perfect for achieving that.
I also seeing Switch Mini/Pocket thats smaller and around $100 cheaper than regular Switch, just for handheld play.