Yes, get it, the remastering has been done well and CD 2 is worth it alone as it comes with many of the extended 12" mixes that were previously only available on vinyl.
Also check for the Diamonds & Pearls video collection which also just got released on DVD: