Bolded the most important part here. To an extent, that renders the rest of this meaningless. The notion that the top guy is solely responsible for drawing went out with the territory system. Shawn Michaels didn't have the supporting that Rock, Austin, Hogan, and Cena had. Not even close. Nor did any of them have the competition (WCW in its prime) that Shawn Michaels had.
That drags down the entire WWF, including Shawn Michaels. That's why people in India and your girlfriend didn't know who he is. It has nothing to do with how much of a draw he is.
Triple H, Orton, Piper and Hart? Come on, let's get serious for a minute. Those guys weren't even the top draw of their day. Shawn Michaels is between the top level (Hogan, Austin, Rock) and the level of top supporting cast (Triple H, Orton, Hart, etc). Just like John Cena. The guys who were at the top at the wrong time, and could've reached the Hogan/Austin/Rock level if not for factors outside their control.
This right here is just inarguably, factually false. What are you even talking about? When Austin became the biggest star in the world, Shawn Michaels was running a wrestling school in Texas. As the company grew, guys passed him because he was recovering from back surgery, finding god, getting married and starting a family. You're essentially arguing that Shawn Michaels wasn't a top draw because he didn't draw while he was retired and off TV. That's just silly.
To answer the OP, for the love of god, NO "ONE MORE MATCH"!!! He went out the way he should. If he absolutely must come back, it should be to put over CM Punk. And no, neither of them should be heel for that match.