As a short term fix you could use this new Labs feature that John build (the house that John build…),
which once you use them once, would suggest #undelivered and #delivered every time in notes so a lot less typing or copy pasting would be needed.
However, I love the idea of a radio button toggle for undelivered things.