So has CFS at Syerston requested 22 Gp to ask for CAP 804 to be amended? I suspect if CFS did some of the leg work and presented a fait accomplished to 22 Gp then you might get an amendment. CAP804 is not set in stone.
Another approach might be through the BGA then on the bounce to EASA. I know this is not probably going to work for Vigilant drivers.