I ended up with a nice one time discount with Motion Pro. A chain tool that can rivet up to a 530 chain is on the list. They have several to choose from and I'm not sure which to get. Here's the ones I'm looking at.
I'll be using it a few times a year to replace endless chains on various bikes.