Digital BW, The Print

I current use both Lightroom an PSCS2.  I really like the ability to
organize photographs in lightroom and use some of the "raw"
adjustments on JPEGs ( I understand their effect is limited.) 
However, I find going between the two a bit clumsy and would prefer
one program. Question: how much of Lightroom's capabilities have been
incorporated in CS3?  If Bridge in CS2 has been replace by a
Lightroom-like organizer in CS3, I would upgrade in a minute.

Steve