[@Elitestpotato] for the overall story,  I do think that 5 years fits better. 10 years after a war has settled might be too long of a time for things to be stirred up again. People would just be settling back into their lives, and the fear of magic is still fresh in their hearts. 

As far as your character,  I do prefer the idea of just having his sword and shield enhanced in such a way. It also may be mu ch more interesting of he was very very skilled, but perhaps gained mastery and his fullest potential when finally slaying jeltheor. But that is only my opinion. It is very hard to become a master of anything in just 5years, but anything is possible with the right drive.  So I will leave that bit up to you.