Cool thanks @nameless-designer, I'll try to post a report when we get a chance to try this out!
I did eventually notice that the stat-block for the "Tracker" droid has "Welding Tool (Close 1-2)" so that's covered at least! I'll follow your recommendations on the other rulings.