Like you said they are both good guns.
If you want to shoot matches i suggest a 22lr with a bull barrel at 30 yards
But seriously for a comp gun it depends on what you are more comfortable with.
Zues said he prefers the m&p. I prefer the XD. You might not like either of them
Buy what feels best in your hand and in your carry holster.