Fighting Makoto is really difficult, what I do is try to keep my distance (cause if 2A hits it's all over), Second make sure to abuse the bubble when she's in the corner cause she doesn't have much option(If im correct and remember to block for any DP or DD). One good tool I realize which keeps makoto's at bay is the cat hammer/Lion upgrade. Bat is good too, and don't jump a lot, cause if they are like omni then then WILL PUNISH you. Doing this I manage to beat Omni once...........But I lost the other matches :D