The 2nd merchant in the back of the druid camp(by the goblin prisoner) sometimes has a +1 rapier in stock. If he doesn't you can just go to camp and just keep reloading his inventory that way.
Thats 1d8+1 damage for the Rapier, and I think the short sword is 1d6, so rapier wins.
Also.....Eldritch Blast so who cares what he's carrying right? But that's kind of a smart ass answer lol
