A simple(?) solution to all this:
When The Queen passes away..
In their condolence messages/resolutions, the PM/Leader of Opposition/Speaker and whoever else matters, will add that they wish a great/glorious reign to "King Charles and Queen Camilla".
It will automatically be assumed that she is accepted as Queen.
If the press reminds them of Princess Consort mess (they will inevitably do),
The PM or concerned minister politely replies:
"Yes, its true Clarence House announced it back then. But like Duchess of Cornwall, there is no equal alternate title for Queen Consort. To create a new title will require act of Parliament, and that Act will impose the new title on all wives of future Kings.
Since that is all not necessary now, she will be The Queen Consort, which is her right title"
During all this The Clarence House/Buckingham Palace will remain completely calm on Camilla's title. So the problem will be solved. Of course there will be fuss from Di-fanatics, but it will be there anyway..