I've had the same problem. The Var 13 pin tool is the answer. It is not a cheap answer, though, as you can see here. The pins can be unscrewed and screwed in to be parallel to each other and used for adjustable BB cups as well. so at least there's that.

I don't think they are made any more, but used ones are out there. If you go that route, make sure it has both pins - some people sell them without the pins, which makes the tool an adjustable paper weight.