Fun puzzle! I think "kind" and "edition" are both trying to indicate the same E in 20a, and the tenses of "quench" and "munch" don't match what they're indicating in the answer for 15d. Otherwise found this nice and smooth, good stuff!
Found this to be a breeze, but I don't know if that was deliberate. In short, the breaks between the cryptic and crossword parts of the clue are jumping out because the surfaces aren't really hiding them. 16D is great, 19D works, 2D's fine, 13A's solid, I can argue for 18A, even 4D (as in an act of sabotage) or 6D as a dis. But what is a "Browns organ" (13D)? What are "Japanese dog gadgets" and how would they be in "alcoholism recovery program"? (17A) I'm excited to see where your cluing takes you next!