I'm sure someone cleverer than me will answer this properly, but I have to say I took my frame, rear wheel and chainset to a bike shop and just asked them to fit a bottom bracket that made the chainline correct. I decided rather that than buy bits I might have to keep swapping to get it right - let them do that instead.