When I saw that the salon razored your hair, I wanted to add my 2 cents:

You will probably get better curl formation once you cut off those razored ends. I had a stylist do this to me once and it RUINED my curl pattern. I think I waited a month and then bit the bullet and had the ends snipped someplace else, explaining the problem. I swear, my curls bounced back after that.

That razor is evil...
Winter - Aura Naturelle Gel/virgin coconut oil
Summer - Dep Sport Gel or Biosilk Rock Hard Gelee/almond oil on ends only
GVP Conditioning Balm or Curly Hair Solutions Silk Leave in as leave-ins depending on weather. Coconut oil before/after coloring grays.
2b/c mix waves/curls - coarse, frizz prone, med. thick, porous, at-home color, protein sensitive but I still need it sometimes, glycerin-sensitive (I think) in high humidity.