Do what thou wilt.
Where to begin? First off Crowley didn't found the A.'.A.'., it always was and always will be. He merely gave it an outwards structure through which people may physically aspire to attainment. It is not an offshoot of the Golden Dawn, it is infact vise versa.
Crowley's writing have not been "further expanded upon/refined" by those men; his writings stand alone amongst litterature, they are untouchable -literally. These men have perhaps simplified them, thats all.
I'm quite curious to see the relations that you have found between Magick and wicca. Also I had no idea that the O.T.O. had roots in Gardnerian Wicca. I'd be quite interested to talk this over with you, you can email me if you like.
What does Magick have to do with enlightenment? Magick is any act of love under will, the mariage of opposites in divine ecstacy. "Enlightenment" is gained through the realization of the continuity of existence, the union with Naught. That must be done with Love under will, which is, by definition, Magick.
Love is the law, love under will.