I agree with the above poster I use Wheels PF30 bottom brackets. I have trialed angular contact bearings and where I had to change out bottom brackets on a semi regular basis the angular ones still run beautifully over a year later. I am sure people will argue about losing watts but they spin beautifully a year later and anything lost seems insignificant to me.
I installed a BBInfinite bottom bracket (BB30) on a bike I recently put together and I LOVE it. It spins like mad and I was really drawn by the logic how a one piece bottom bracket makes it more resistant towards creaking.
I'll probably upgrade my other bike very soon as well. Note, I got the ABEC-7 bearings (steel), not the Ceramitec (ceramic) bearings but it's still very, very smooth.
I have the same bike and have run a couple different BBs. The angular contact Enduro 6806 bearings are the best for the money. I had a much more expensive one in there for a bit and it didn't stay smooth very long. I now run 6806 ACB's in 4 of my bikes.