Hair Dilemma

So last month I flatironed by hair before I came down to Alabama before my best friend's babyshower I was throwing her. I love the results and I mainly rolled my hair every night to get the curls back in. So about 3 weeks later, I decided to wash my hair because I wanted my kinks and curls back. Lets just say about 3/4 of my hair reverted back and 1/4 didnt. I decided I dont ever want to flat iron my hair again. Right now Im washing it every 14 days and moisturizing it nightly with water and olive oil to help get my curls back all over. And I know I have to keep it moisturized because my hair is shedding really bad and Im not sure if that is due to the protein treatments I have started putting in them but Im laying off all that for a while and going back to nightly moisturizing my hair, massaging my scalp and my protective styles. I guess if its not broke then dont fix it.