Packaging Creative Suite vs Creative Cloud

Hi,

We have an ETLA agreement.  In our Adobe LWS portal, Creative Cloud Packager (CCP) and Creative Suite Master collection are available.

1 - For an end user who requires the full version of photoshop (not elements) and no other applications, do we:

A) Use CCP to package Photoshop CC or

B) Use Adobe Application Manager to Package Photoshop CS6 Extended extracted from the Master Collection download.

2 - If we have some end users that want photoshop only but on subscription, and others who need photoshop + the additional cloud applications would we need to create 2 packages with 2 different tools for the same application?

Thanks,