here is what I would do.
>scrap clan battles entirely
>develop the shuji relationship, make him an actual person not saying random shit
>develop the love triangle
>final fight has a double KO with suits disabled but in kira kira land they decide to stop fighting and say they love each other
>they go to the earth and have a family.
only thing they did right was Char good end.