Something interesting is that in Madrid you need Spanish to survive, compared to Barcelona where most people (at least on tech circles) can speak English fluently. So yes, if it's for Spanish fluency, definitely Madrid.