Both the books you've mentioned are very light on deco theory, try either the PADI Encyclopedia or better yet the Diving Knowledge Workbook which is a fantastic way to improve your grasp of everything you need to know, not just in this subject but all accross the board for your DM exams.
Hope this helps and good luck.
Kev.