Found a couple of bloopers in my original - an extra measure after mm14, and the last hold is actually on a plain E major triad, doesn't resolve to tonic (!)
Angela - Antônio Carlos Jobim