Yes.
So,
(1) moving up from the equilibrium, potential energy of spring increases, gravitational potential energy increases (less negative)
(2) moving down from the equilibrium, potential energy of spring increases, gravitational potential energy decrease (more negative)
Is that correct?