Found this a challenge all the way - some very tricky clues and quite a margin for error entering them (even with the gimmick being fairly obvious). The endgame is very neat (I think) and, again, tricky to spot even with the generous preamble and disposition.
The best EV for a while for me.