Yes, that's it I believe. We found a few places further out that looked really nice, but decided we'd rather be walking distance to the main attractions.
Hope it all works out! I'm sure we'll enjoy our time in Madrid.
Ten Weeks in Spain: Adventures in Spain with our three year old.