I think an architrave box may be borderline too wide - besides, knockout in the top or bottom of an architrave box is less than 20mm, so difficult to connect to that 20mm conduit.
I hated it at first, but perhaps the existing set-up IS best, once the box lid is filled over.
Personally, I would...