To be fair, every Buffy's boyfriend , former or not, turns into a puppy-eyed smitten teenager around her ( the protagonist curse ?) that has no will to resist her, and no other story but to be with/around her. Look at Riley S8-9 , and the guy is actually married. Look at Spike in S9, he is basically in the same position - sans the reciprocity.
I don't think Joss will stay away from Angel now that his title is back under the same roof of DH. Nor do I think Angel will remain in a separate book for long - the numbers do not add , and I cannot see how DH will support two main titles past S9. I sincerely hope the two comics will join into a single story - because ruining Angel's series just to bring forth gloomy, lame-ass A&F is not enough of a pay off for me, and I cannot see them trying to fit a broken egg back into its shell by returning Angel to LA and pretend S8-9 never happened - better make an omelet out of it and run a single story with extended cast. And no, I do not want any of the dead characters from AtS or BtVS back at this point - it will ruin the whole 'no more magic' plot. If we are headed towards the Fray future - lets bite the bullet and go on with less magic more tech universe.
I agree with you that the numbers don't add up, but to say that Angel turns into a teenage boy every time he is around Buffy is pretty far off the mark. Angel in the latter part of Season 3 of BtVS and season 1 of Angel was anything but a sissy boy when he was around her, he was very much his own person.
Buffy has become too big for her boots in the comics and an equally strong character, who sometimes does their own thing, like Faith & Angel's 'fang gang' is exactly what she needs IMHO.
As for the less magic more tech sentiment, hmm I'd prefer magic and tech be sidelined unless a big bad is involved. They both seem to be used as deus ex machina far too often of late, and are both like a can of worms.
So personally, I'd prefer a weakening of magic, or at least those who wield it, and a meddling of it and tech (but without effing spaceships!). Something akin to the tech shown in the Dark Angel franchise.
I don't think Buffy fighting Klingons in Spaceships/her being in a spaceship is really where the heart of BtVS resides. I know Joss Whedon is a serious fanboy of Battlestar Gallactica and made Firefly but seriously, you want more tech?