I would add the book 'Elements of Computing Systems' [1] by Nisan and Schocken (in addition to CS:APP) as a replacement for COD. COD is more of a reference book rather than a teaching one.

[1] http://www1.idc.ac.il/tecs/