Changing WP-action from post_publish to two specific transitions: from being a draft or being a future post to a published post.
This *should* solve the problem with posts being mailed on update.