Yes, M-Sport includes everything the Sport package has and adds the headliner, M door sills, and M Wheels. You can still get the Sport package alone for 2009-11 models but M Sport was/is only a $200 addition.
Also, about the mirrors. Some owners with '10/'11 models have retrofitted the smaller '08/'09 mirrors on their cars.
2007 SLK55 AMG - Black on Gray/Black - AMG 030 Performance Package
2011 135i - Traded
///M-Sport - Dual Clutch - Harman Kardon - Bluetooth - iPod - Shadowline Kidney Grill - 225/255 Star Specs - Hotchkis Front Sway