It was an interesting twist but I have worked out the message and arrived at the final grid without solving some of the 'clue clues' IYSWIM.
I'm not sure what I was originally supposed to enter in at least 2 cases but having filled most of the grid it's hard to unsee the letters and cold solve the clues again.
It's a bit of a curate's egg for me.