Cottonpickers will work with you on custom orders. The single current versions are significantly cheaper as well.
Those xtar's seem neat as does the 4 sevens. I think I would be more inclined to just buy the hobby charger and strip my old trustfire charger to make a cradle.
I do love the idea of Neo Mags as battery connectors.