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.
“YISUN was questioned once by their disciples at their speaking house. The questions were the following: ‘What is the ultimate reason for existence?’ To which YISUN replied, ‘Self-deception.’
‘How can a man live in perfect harmony?’ To which YISUN replied, ‘Non-existence.’
‘What is the ultimate result of all action?’ To which YISUN replied, ‘Futility.’
‘How best can we serve your will?’ To which YISUN replied, ‘Kindly ignore my first three answers.’