You are dead on with all your good bits/bad bits of Angel. If you get rid of the Evil Cordelia thing then you get rid of the 'having a baby with Connor' things and everything is kind of ok again! And the silly baby Connor bits - the idea of Connor was ok but they went a bid odd with it. If they had continued with the thing that everybody wanted to kill Connor it would have been more interesting than the whole how do we send connor to college thing.