Having two templates is the nicer solution, but you could just wrap them unconditionally - being wrapped twice shouldn't be a problem.

FWIW there is a task for wrapping edit notices: https://phabricator.wikimedia.org/T337640