I removed my crankset this morning before work and swapped to a different crankset, and just leaned on the pedals with my weight down in the shop. It seemed to be better. I re-installed the original crankset, and it's back to the way it was. Based on this, I don't believe it's in the bottom bracket itself, but it may be in the interface of where the crank arms slide over the square taper. I will likely drop it off at the bike shop and let them look at it under warranty.