Upload file and fill in fields in one step; or trigger a rule when a file is uploaded
So I believe that uploading and editing files works correctly with the latest dev release of the media module when using a file field or image field.

Like you said when you go to file/add it is using the file_entity module which I believe they are discussing adding upload and editing here http://drupal.org/node/1553114.