Check out "Thinking Physics" by Lewis C. Epstein, and later, conceptual physics by Hewitt.