Two other places you may want to consider are Grand Velas and the Riu Nuevo Vallarta.
Both are in Nuevo Vallarta and are all-inclusives (an aspect I'm not crazy about since there are so many great restaurants in PV), they are newer resorts on great stretches of beach.
These are about 25-30 minutes (cab) away from downtown PV.