It's kind of a toss up on the accessory barrels, a complete rifle in 17M2 or 17Hmr sells for $130 here and at Walmart, the bull barrels cost $90 including shipping and fitting plus shipping to them if you have to pay it, which in this case may not be the case in your situation, they should offer to send a call tag or reimburse you for shipping.
I would call them Monday and make those arrangements if your smith doesn't fix it. Then call them while it's there and order the extra barrel if you decide to and ask for the trigger job then.
Normally you would put the trigger job request on the barrel order form. They don't show the 17M2 barrel on the web page, but it's available, several barrels are missing as a matter of fact.
When ordering accessory barrels, they only want the frame and stock w/forend, the barrel isn't sent, but in your case, they may wany it so they can test fire it, dunno, they'll tell you what to send, you might ask about an accessory barrel, dunno how they deal with the shipping if you want a barrel or 2 up front.
Their toll free number is in the centerfire FAQ and Help sticky.
Be sure to give us a blow by blow account of how this works out for ya.
Tim
http://hr1871.com/Support/accessoryProgram.aspx