Ideally I'd like the sensor to outresolve the optical system. The advantage of a soft 100% is that you're then free of aliasing artifacts and no matter how large print you make it will not look "digital" up close. So in a way, diffraction is your friend, it smoothes away aliasing.
However, with "only" 39 megapixels or 33 as I have a soft 100% means that the total resolution is a bit low if striving for "large format" resolution. If I had say 120 megapixels I'd still shoot at f/11 get a soft 100% and be happy with a file free from digital artifacts that resolves the optical system almost in full. Today megapixels set pricing though and there are some technical disadvantages of small pixels, but in the future I hope sensors are all so high resolution that it will just be seen as "dumb film" and what we need to care about is only the optical system.
When I started with MFD landscape photography I shot mostly at f/11 with my 33 megapixel back. But today I shoot more often f/16, just because I've started to dislike aliasing more than lack of resolution. My intention is to upgrade to more megapixels though so I can shoot at f/11 with less aliasing than today. I have 7.2um pixels today, and aim for 6um. Not sure if it will change that much on the aliasing front though, the difference from 9um (22 megapixels) to 7.2um was larger. A comparative test for that would be interesting.
I guess the look of f/11 with 6um pixels should be about the same as f/14 on 7.2um pixels. Better, but a little too much aliasing still for my taste, but from a cost and tech wide compatibility aspect I can't go to smaller pixels now.