But I just received an email from Matt Stefans who told me about OpenStax which has a complete book on economics. At first glance it looks pretty good as it seems to cover all of the topics, has great graphics and a bunch of questions in each chapter. It also has a table of contents which you can use to quickly get around the book as well as a search engine to bring you right to your topic.
So now you know what I will be doing in June which is to go through this textbook and see if it covers all the topics necessary as well as if one can find topics quickly enough. So you know you can get the book as a downloadable pdf as well as see it as a html page which is what I have linked above.