What needs to be done before the Mario games stop being story-oriented

Obviously, Bowser's plan to rule the galaxy in this first Super Mario Galaxy is ridden with flaws. Especially keeping Peach alive to rule alongside him instead of just killing her, which would not only help him maintain his evilness, but it will give Mario nothing to fight for, and the Mushroom Galaxy would fall much easier. And instead of killing Mario at the beginning, he is banished to another part of the universe...where Rosalina is waiting and the recruits Mario to help find the Power Stars Bowser stole from from the Comet Observatory. And who's to say Mario can't find a way back if he's still alive? Maybe destroying the Power Stars would help Bowser to, but he can't bring himself do that. And in the end, because of his delusions of grander, overconfidence, keeping Peach and Mario alive (the latter until the final battle, but he fails]. And it's not just Mario defeating Bowser and freeing Peach that leads that sun to collapse, endangering the universe's life, INCLUDING BOWSER; it would have collapsed anyway, but Mario defeating Bowser untentionally speeds up to collapse.
Well, sure video games aren't so much about the story. But if things hadn't become too predictable enough.
In Super Mario Galaxy 2, THIS time Bowser does his homework. He uses Power Stars to make him the size of a planet. And what do the good guys do? They procrastinate at the Star Festival rather that making sure the Power Stars are secure BEFORE Bowser would steal them. At least Mario and Rosalina could have prevented that. Given what happened in the last game, Bowser getting those Power Stars in SMG2 would NOT be written in stone. This time, a blunder by the good guys gives Bowser more of an advantage. And this time, BOWSER leaves Mario alive and fails to prevent Mario from following him. At the end, when Mario defeats Bowser, Bowser reappears, but is defeated again.
Now, I have an idea for another Mario game, maybe an RPG. It starts when Bowser is looking for the Power Stars and can't find them. Then, he discovers them, and Princess Peach in the Mushroom Kingdom, and tries to kidnap her, BUT suddenly, it's revealed to be a trap set by the Super Mario bros., Rosalina, her lunas, and the Mushroom Kingdom. Bowser is forced to retreat empty-handed. He officially is now considered a laughingstock. Bowser is pissed off about the times he had been an ally of his enemies, and although he denies it, sparing Peach and hesitating to kill the Super Mario bros until the end has derailed his evilness. So, he seemingly goes to the center of the universe for another attempt to create his empire, but decides to get extra help, as Kamek, who had previously been bewitched by the Smithy Gang in Super Mario RPG, reveals that the Smithy they encountered is one of many mechanical clones of a King of Smithys. Bowser decides to join the Smithy King to prove he is still pure evil.
However, he fails to realized that Peach stowed away on his ship, smuggled in by the Comet Observatory. Peach knows that Bowser's plot would suffer if she was help captive by him. Also, the Super Mario bros decide they need more help. In a twist of fate, Mario and Luigi discover in Monstro Town...ex-Smithy gang members Mack, Bowyer, Yaradovich, and the Axem Rangers--first seen in their unmorphed alien form as new disciples to Jinx, also from SMRPG. Also, Luigi discovers that Bowser's long-presumed-dead lover, Janis Koopa, the true mother of the 8 Koopa kids, including Bowser Jr. The name Janis comes from Janis Joplin, given that the initial 7 Koopalings were mostly named after music stars. She had faked her death after disapproving of Bowser and his Koopalings terrorizing 7 Worlds in Super Mario Bros. 3, as Janis isn't necessarily evil, just like Horace Slughorn in Harry Potter, once head of Slytherin wasn't necessarily evil. While the Super Mario bros were occupied, he kidnapped Peach back then, when holding Peach hostage was more damaging to the Mushroom Kingdom given what we know he had done in the first NES Super Mario Bros, a plot he did behind Janis' back. And a younger Bowser had kidnapped a younger Peach many times in the past until he met Janis as a teenage Koopa. Janis served as a conscience for Bowser, but Bowser was seduced into being evil by Kamek.
So, Luigi tries to find Janis, with the Axem Rangers as guardians. Luigi becomes a White Axem Ranger leader, not because they already have a green ranger, but so Luigi can hide his identity from being obvious. That's one aspect of the game, Luigi and the Axem's journey to find Janis, who would help them against Bowser, and she agrees as revenge.
Soon, when Bowser apologizes the king of Smithys about helping Mario and Co defeat the Smithy who came to the Mushroom Planet and asks for help to rule the world. Suddenly, he and Kamek discover Peach. The King of Smithys and Kamek as not averse to killing her since her presence will sabotage Bowser's plot to some degree like the last times. However, Bowser makes an excuse to spare her by claiming to concentrate on destroying Mario and claims to kill the Princess later. The Smithy King seems to go along. Bowser allows the King to make mechanical clones of Bowser, like the Smithy of Super Mario RPG did with his now-reformed alien generals, which would serve as bosses in each level of Mario's story. Similar to in SMB1 how in the first 7 worlds, in the castle levels, if you manage to stay as Fire Mario, there fireballs expose Bowser as an impostor, one of the standard enemies in the game, and in World 8-4, he faces the REAL Bowser.
Mario, accomponied by Rosalina, Mack, Bowyer, and Yaridovich. Which their knowledge of galaxies, they help Mario find the power to defeat Bowser and the Smithy King. In every world, Mario would defeat a robot Bowser clone. The Smithy King would always add an advancement, but as Mario & co. continues to destroy them, Kamek is fed up and attempts to kill Peach to make things easier for Bowser, but an enraged Bowser kills him for good (New Super Mario Wii doesn't count). Bowser is angry for Peach making him kill Kamek (tho he did it himself) and still claims he will kill her like he promised. Still, Peach doesn't believe him, tho she keeps it to herself.
This doesn't go unnoticed. Since she's a Magikoopa herself, Kammy finds out that Kamek, who turns out to be her brother is dead. As revenge she helps Mario defeat the most powerful of the Robot Bowsers, only to get killed by a Smithy associate.
Finally, in a final battle between Mario and Bowser, both using Power Stars to battle at similar sizes. Bowser then managed to destroy Mario completely as it seems. He laughs his victory, but then the Smithy King tells him he can kill Peach now. He finally realizes that he can't, and the Smithy King calls his bluff. He also realizes that too many times being an uneasy ally of his enemies has soured his evilness and he can't do it right, as he couldn't in the last two Super Mario Galaxy games. Despite having a long run as the evil archenemy, he realizes that they owe him for helping them at times, even tho he did it claiming to remain the main villain. And now he realizes he needed Mario to survive after events of the games this past decade, and breaks down, upset about killing Mario, and wishes he weren't so cruel to Janis, who overhears as she comes with Luigi and the Axems. Bowser decides to go kamikaze to destroy the Smithy King, but is grabbed by the tall by...MARIO! Turning out to be alive and using the trick Bowser used at the end of Super Mario Galaxy 2, he rallies the good guys to fight the Smithy King. They are victorious. Bowser apologizes to Janis, and the Koopa Kingdom and Mushroom Kingdom cease their enmity and become allies.
But that obviously won't be all. Since Bowser is currently now a flawed villain in the existing games, he can't do the evil thing right without getting himself hurt or endangered with his intended victims, Bowser moving on would bring the Mario games back to the similar formula, albeit more successful and no longer story-oriented. And there would be a new main villain that the Super Mario Bros would face, who would NEVER side with them, and in Mario Kart games, would be a boss, rather than a playable character, much like Wizpig in Diddy Kong Racing. Also, Bowser would get his own series with Janis as a 2nd player that could be different than the Mario games like the Angel TV Series is different than Buffy the Vampire Slayer, tho part of the same canon. How about it?