To fill rust pits, and especially the pinholes, the body shop I once managed used Devcon Epoxy Steel. I think the name has changed since then, but the product Devcon sells these days is essentially the same. It's basically atomized steel powder in an epoxy carrier that's MUCH more durable than J-B Weld.
Jerry