I like your recommendations mostly, just wanted to point out that Organic Maps has had a falling out with the Open Source community that built it, so I wouldn't use that anymore. The community fork is called 'CoMaps' now.