Ameen, May Allah show us the right path.
But brother, can you please tell me where does it say in Quran and sunnat that visiting graves of pious people is shirk. To the best of my knowledge, all the major sins and haram acts have been clearly mentioned in quran and hadees.