I'm planning on using 7 for commuting and occasionally longer rides.

Haha I would prefer to keep the mavic MA40s as is but if the others are more reliable or MA40s are known as crappy low end wheels then I won't mind using mixed.