Analysis Office or EPM Add-in or Both?

We are in the process of upgrading our BPC installation from 7.5 to 10.1 (standard). We also use Analysis for Office as one of our main BI tools for enterprise BW. Which AO/EPM add-in should we be installing? I've seen mention that we should use the Analysis Office install, but then see that this should only be used for Embedded BPC.

Thanks in advance for your help!