I think the best thing is to get a dialogue going with the local council building control
I've found over recent years when dealing with commercial properties that because in England you can use private Biulding Control companies, that your local council people have become more willing to engage and advise informally and be a bit more open to change
