I like this approach and used it recently in a fairly complex app. I managed the ‘calling-state’ problem using the $previousState capability found in http://christopherthielen.github.io/ui-router-extras. This allows you to easily store the calling state of a modal and return to it on completion.