I did this same exact upgrade. When I did I talked with two stores about it and they both
Told me that if your switch to SRAM then you have to use a SRAM bb30. The FSA BB30 is not compatible hopefully I didn't get roped into buying a new one when I didn't have to.