Marc, wow! That's crazy! That they turned around so much. I second Polo's thoughts on going back to therapy, WITH your parents, and finding out what happened. It seems to weird so me they once WERE supportive and now are totally UNsupportive, not even letting you express yourself as a butch female (which is not great, but much better than a fem female IMHO). How can they force you to wear makeup? Lots of straight cisgirls don't wear makeup, because it's expensive, bad for your skin, and they just appreciate their skin without all the fake ->-bleeped-<- on it. You could maybe tell them you get an itchy skin due the makeup and/or just want to see your face as it is again. You don't have to go full-male/butch right away, but a bit less feminine would be great already, I bet!
And therapy! Your parents (and you!) definitely need therapy and help to fix this. You CAN NOT for ever go on ignoring it, how hard that might be. It will be hard, very hard, especially with parents like yours, but you don't have to do it quick, take your time. We are always there for you to fall back on.