So... the cite templates could be made even more granular to do templates for every reference (I'd put these in a different namespace). The "second edit window" would be invoked by clicking a link from the list of included templates.
A references namespace has been suggested before. It's worth considering.