No, I saw Buffy as the young man and Angel as the doomed teacher. The doomed teacher is as responsible for the relationship as the young man and as obsessed.
That's what I meant to imply above.

I'd agree that yes the under-cutting of the gothic romance trope is set-up from the get-go. It's actually even earlier than you mention. I did not mean to imply it starts in S2. It actually starts in episode one of the series Welcome to the Hellmouth - with Angel lurking in the shadows.

Angel, note, doesn't really do anything to help Buffy.
His information tends to be more cryptic than useful.
And when he does help her - it is calculated to get a romantic response.

It's not "love" that pulls him out of the sewer, but an infatuation. After all, he doesn't know her at that point. She appeals. And he wants. Desires.
As Whistler states - she must have been much more attractive than the last girl. He also waits a long time before approaching her. Until he's at his best, and when he does, he is careful about it, seductive.
He is every young girl's fantasy - but pull back the viel and you have a monster, something horrific who will turn on a dime.