Glad what I said helped, although I must admit it wasn't my intention to get you to switch characters in the battle.

Of course now there is the actual final boss to fight but, well, I can't see that really being a problem (unless of course you don't have the Memory skill or something).