Cool, I'll give that a go. You've answered my question as to whether those spacers were even meant to come out!

Edit: So I have fitted it with one spacer in and one out, and it seems to have come together quite well. I can't check the chainline until I get the wheels and cassette sorted, but for now I think my BB and crank situation is under control!

Thanks!