It’s the bb with the big plastic cups that I’ve got, I think that’s the FAG one.
Remember, mixing iso and jis tapers isn’t the end of the world, the angle of the tapers is the same, it’s the length that differs so mixing tapers just won’t give the chainline that the manufacturer intended.
based on this i'd have to switch BB's as the non-spider cranks are from 2012?
https://brilliantbikes.co.uk/content/25-brompton-bottom-brackets