Enforcement should encompass all aspects of the planning permission which were not properly addressed on the original. An application for retention also allows the Building Control to have their say, without doing so independantly.
It sounds like a real mess to be honest.