Several months later, I finally remembered I should update this thread so it might be useful to others at some point. I ended up doing a combination of all the above suggestions, and some others
- Some places, where the step was minimal, the architrave just went over the plaster and the gap was...