Yes, that looks like thr best thing. Also maybe in the next world Amaya can do something more on her own. Although here will be more interaction in the next world instead of constant fighting.

And don't worry LB. I myself am at vacation and the internrt is really crap. Hopefully it works better on my laptop but my phone even has trouble with loading Facebook. I'll see if I can make a proper post later today or hopefully tomorrow.