Im not sure they should have started with Spike and Drusilla. Maybe just give them a starter big bad and save them for later?

Or have the Whirlwind and The Master face Angel and focus on someone else?