The above reply was edited. It appears that it won't make much difference whether you report the ESA or 529 distribution. Since the 1099-Q for the 529 is in your name (and will go on your return), reporting it will make the entries easier.
