This is pretty spot on. I use español when comparing Spanish to another foreign language but castellano when talking about the language as a whole. The latter is the most popular in Spain because español is also the nationality and we also can speak catalán, vasco, valenciano, gallego, and others