Spanish Language School in Madrid - Ideas?

Hey all,
I am looking for a Spanish learning school with intensive courses from B2/above level, pre-master language study. I studied for two years already in Shanghai. I plan to move over in April Protected content , depending on the school terms, can start earlier from Feb/Mar. I am also looking for recommendations of university in Madrid for master study in Marketing & Communications (teaching in Spanish) with 12 month term. The ideal idea of the language institution would be affiliated to the university if not, close to each other to avoid relocation.
As I will need to apply for the language school in Oct/Nov already, any advice is more than welcome.
You can leave a message here or contact me at Protected content

Thanks very much for the help!
Best regards