Dd is currently working through this http://www.barnesandnoble.com/w/the-complete-book-of-grammar-and-punctuation-grades-3-4-school-specialty-publishing/1018131979?cm_mmc=googlepla-_-book-_-q000000633-_-9780769643328&cm_mmca2=pla&ean=9780769643328&isbn=9780769643328&r=1 and it does include diagramming.