It may be a mistake to be too analytical, or try to follow methods for longer, more "classical" devices.
I've observed up close, some analog "portable library" folks try to do finFET versions and what I saw, as an analog guy, disgusted me. Talking sub-40dB AVOL (typ) and other ugliness.
You 'll be forced to do the kinds of things you're looking at, and away from "just one cascode layer, same old" to "oh, crap, I need 3 to make Rout useful and that makes two of 'em "live" rather than DC-fixed...".