I think you're correct here. There is a redefinition of each religious group by Guru sahibaan in Gurbani. The new vision Maharaj offers, naturally and gently funnels them into a more Sikhi oriented way of life. The 4-doors-one-walkway metaphor.
It's not a minority at all.
Sikhs who fought for the British in the World Wars or other situations (like the Battle of Saragarhi) are always being celebrated, both in Punjabi popular culture, and by average Sikhs who are desperate to find something to make them feel proud and relevant.
Look at the number of statues and monuments in the UK that have been erected, with the support of the local Sikh community, celebrating Sikh mercenaries.