Sorry, but another vote for Campbell. Maybe dull, maybe dated and maybe bulky - but has all the information in one place.
Haven't looked at OnTrack - so I can't comment on that.
With respect to the diagrams required - if you have your own already then scan them in and import them to Powerpoint ( a blank paper behind a transparency works ).
The FAA Pilots Handbook of Aviation Knowledge (FAA-H-8083-24) is downloadable from tinterweb and there are numerous good diagrams on Wikipedia or other such sites.
DD