Your vote on this answer has already been received
Neither. My choice would always remain Sardar Vallabhai Patel, a astute personality with a ability to discern the practical aspects that are involved in administering a country, thus sagacious to the core, a cut above the others in the personality that he was. At a time like this, when politics of the country has fallen to abysmal levels, he would have been the right man for the right job to bring back dignity to the political class and bringing a semblance of propriety to the vast bureacratic structure of this country.
This world is not inhabited by angels. Gandhi was fine, with all his drawbacks to rally the nation to fight against the British empire. His role ended there and even if he had lived long after that, he should only have stayed as a kind of spiritual head of the country, far removed from administering this country by any direct or indirect interference because that would have had far reaching consequences in taking the country forward to the end of the 20th Century, a