HELP Madrid to Barcelona

Traveling from US to Madrid landing May 13 and returning to US from Barcelona May 26. Looking for advice on other places to visit and how long to stay at each including Madrid and Barcelona. Will not be renting a car. Skipping the Andalucia region due to limited time. Open to any suggestions. Likely staying at airbnbs.

Husband would like to catch a football match as Real Madrid/Atletico Madrid/Barcelona and Valencia all play around this time.

Rough thoughts.. start and end cannot be altered. The in between are just thoughts and not all are must dos they are just places we stumbled across based on interests.
Madrid
Day trip to Toledo? Overnight?
Valencia
Possibly Peñíscola
Girona and one of the costa brava towns like Tossa de Mar
Barcelona

Any advice appreciated! Thanks!