I thought Lion had fixed the replace rather than merge behaviour of the Mac OS? A tool like 7Zip should allow you to extract and merge, and I think (test on a safe location) that I was told that copying, instead of dragging and dropping, would merge on Lion.