You know, I wanna be hyped for this fight but I am so certain the writers are going to pull something out to render Discord's power useless against the Queen. The best option, in my opinion, is having Discord fighting Chrysalis head on, with her having grown even stronger than she was when she beat Celestia putting her along Discord's level while the rest of the team deals with rescuing the mane six.