So what are the solutions, then..?
So, I'll tell you one thing that we can all do. Talk to Muslims. Just about normal things - a simple 'good morning' will do for a start. Living in a town the press often consider an axis of jihad I come into contact with Muslims on a daily basis and from chats I have they do feel very much under threat and that white people fear, ignore and avoid them.
And as for accusations of there being "too much political correctness towards Muslims" most of this is informed by made-up "Muslim Myths" e.g. Muslims want Christmas banned; or another one I heard the other day " a major chocolate company is taking the word 'easter' off their chocolate eggs as it offends Muslims" - seriously this myth did the rounds and people were horrified that this obvious symbol of Christianity, the easter egg(!), was being effectively banned in this way.
Rant over.
I agree with you to keep the contact in daily life, and I also know that a lot of Muslims feel very uncomfortable.
But regarding the PC, your excample, the easter egg...currently it seems to be an obviousness. The issue with PC is, that i.e. christian symbols like the egg, could disappear... not because it will be banned by Muslims, it rather could disappear because PC people "think" it could hurt islamic minds.
I travel often to Munich. At the airport there was all years long a christmas market, since this year it is named a "winter market".