This whole "diffraction limt" business is a huge red herring.
Ignore it.
Saying that a higher resolution sensor is more "diffraction prone" or has a lower f/number for "diffraction limit" is like saying that a higher resolution sensor is more "camera shake prone", or has a "lower limit" for lens blur or misfocusing than a lower resolution sensor.
That's baloney!
The thing is:
Diffraction, camera shake, lens blur, misfocus, etc., all affect the projected image from the lens.
They are all totally independent of what's behind the lens.
That could be film, a sensor, or an ant you're trying to burn with a magnifying glass. The lens and its projected image do not know or care what (or if anything at all) is behind the lens at the focus plane.
So the question really is:
Would you rather have a sensor that has the capability of capturing a higher resolution representation of the projected image from your lens, or one that has only the capability of capturing a lower resolution representation of that same, exact, projected image?
The higher resolution sensor allows you to benefit from the times when the projected image is better. And it allows you the processing benefits of a higher sampling rate for all images.
This higher sampling rate allows for more effective processing, be that noise reduction or sharpening, etc. I cannot think of any instance where a coarser sampling of any signal would result in a better reproduction of that signal or more data from it. It just doesn't make any sense no matter what kind of signal capture we're talking about.
The thing that has so many people confused is that a few camera reviews have come out recently which used very ambiguous or downright incorrect wording or analysis of some high resolution cameras. What they (I hope) meant to say was this:
A higher resolution sensor starts to offer diminishing returns when used with a crummy lens, bad technique, or at tiny apertures, and thus, you may not see the full advantage of that higher resolution sensor for all of your shots.
But people wrote things badly. And others grasped onto it and took it to mean that you'd actually get a worse image using the higher resolution sensor (all other things being equal). And that, of course, is total baloney.
So fear not.
Get the high resolution sensor. Some of your shots from it may not realize its full potential because the lens or technique will be the limiting factor. But you'll never get a worse image as a result of that higher resolution capture of the same, exact, projected image from your lens.
--
Jim H.