Well, the swords can and have been reforged, apparently. Making one a rapier somehow would be weird, but could happen.

That said, how about Justine gets the Sword of Love? That could save Thomas just as well, and it would be unexpected.