I see the issue... thanks for bringing it up! I didn't quite understand all your options, but I've been trying to replace the "improve" link with one that works. You can see my attempts in the Template:Occupy Portland Event history. My attempt successfully created an edit link... to the OccupyPortlandEvents page (not the transcluded single-event page). Obviously not good enough, so I removed it. I have to take a friend to the hospital now but I'll give it another shot when I get back in a few hours. In the meantime, by all means if you want to give it a shot, feel free. The transclusion is confusing the issue a little but there may be a way to link to the transcluded page that I haven't found yet.