I'd be tempted to give Olsen a go, feel he has earned his chance. Let Martinez go to the World Cup early.