Your best bet for guaranteed compatibility is to replace the bottom bracket with the SRAM version. The $40 you spend on it will possibly save you a lot of aggravation.
I've seen a guide somewhere online for whose BB's are compatible with whose cranks. Can't remember where though.