Yeah, just... just get rid of Shadow.
And Dr. Robotnik is villain enough for the Blue Blur. There's a reason why Metal Sonic is usually the second to last boss and not the final boss.
Also, Mecha Sonic from Sonic & Knuckles was just plain cool. Bonus points for him using boss machines from previous Sonic games.