Well the focus stacking improved a lot between CS3 and CS4, so I would hope for additional improvements for CS5.
But honestly, the best option is to spend $55 for Helicon Focus Pro. It gives you quick & easy control over halos, and has a great rubber stamp tool that makes it easy to fix ambiguous artifacts such as the inevitable moving branches against the sky. Very well thought out user interface. You can even send your processed images directly to Helicon Pro from within Lightroom. Full 16 bit, color managed path throughout. CS4 stacking can't touch it from a quality point of view, the CS4 masked edges are pretty gross compared to what you can get with Helicon.
If you only want to spend $0, CombineZP is pretty nice too, but it's only 8bits and it reduces your images to sRGB.