I've seen others re-use joints from junker toys. which would be a great way of getting hold of pins.
For non-complex stuff, this is what I would recommend. I have repaired many bots using junker parts from differing bots and even on some custom testing I just use junkers. I have a huge box of junker parts I keep just for that very reason.