Barenreiter's Christoph Wolff edition is quite serviceable. I used it a few
years ago. It's published in three volumes: 1. Ricercari - written on two
staves, 2. Trio sonata with parts. 3. Canons, etc. (with solutions to the
puzzle canons) with parts.

It's clean and easy to read - an important factor for me and my middle-aged
eyes. My only quibbles with it are these: 1. the notes are widely spaced
across the page, which makes for lots of page turns; 2. I find Kirberger's
continuo realization (included in the main text for historic reasons) to be
uninspired and tedious with its relentless four-part texture; 3. Wolff makes
arbitrary part assignments that we cheerfully ignored in our performance.

Bob Heath