You have to add conditions to the submit button that check to see if the file has already been submitted. You do this by adding a "submitted" field to your form that is hidden and is a regular text field. Add an action to your submit button that sets this field to your pre-formatted, concatenated filename. Also, add a condition that checks to see if that field is blank. If it's blank, set that field to your preferred filename, submit to the library, submit to email, then close. Add an entirely separate rule with a condition to check to see if that field is NOT blank. if it's NOT blank, then do not set the filename and just submit to library, submit to email, then close. Lastly, go to your SharePoint Library Submit data connection, and check the box at the end of the wizard that allows overwrite. This way, new files will show up new in the library, and modification of existing files will overwrite the previous version of that file without any inconsistency.