Charming has his sword later in the timeline such as at his and Snow’s wedding and at Emma’s birth so he cannot trade it to Rumpel in fairytale land way back before he kisses Snow awake at the glass coffin.
I agree that Emma with a sword has to be after she believes. What if Regina is somehow redeemed in this episode. That would be wild. I am not sure that would work. Regina has to still be a villain next season. There is just too much back story to tell still.