I would say take the class after you get your own equipment. As it was said in an earlier post, AOW should really be called Open Water part deux. The skills taught in that class (particularly navigation and night diving) are skills that should learned right away. Besides, a few more dives with an instructor never hurt anyone.