I feel like adaptibility isn't such a bad move. Yeah the Switch is cool now as a hybrid console, but in the next gen just a hybrid console alone isn't going to cut it.
Maybe if Nintendo really thinks it can't make another home console then they'll finally shift to what you're proposing...