I have the 7D and will let you know when I get a chance to play with it. Two weeks and I have only had time to use it twice in anger.
About the higher resolution
1. Yes it will show the LENS diffraction limiting more than a lower resolution camera, note it is the lens that is diffraction limited not the sensor
2. If you do the maths you will see that a higher resolution sensor always gives more detail even if the lens is into difraction limiting. There are diminishing returns however.
3. If it bugs you (unashamed punning) you can use one of the lower resoluton settings.
The big thing about the 7D is the AF system, so if your sole interested is macro it might be overkill choice, try a 50D or 5D2 or wait for the 60D.