I would certainly ruturn to your apartment. It is well very nice, maintained and close to the main sites in Madrid.