Phelps in Mesa enjoying return to swimming