As of S8, I think you're probably right - Buffy always has and always will love Angel more. Do I like that? No. But I don't see any point in denying it. Right now, I'd rather Spike in canon get over her and get a life of his own. But I'm always going to like Spuffy better, and think that IF Buffy had been able to get over her issues and give Spike a chance, they would have made a better couple. And I will happily write fanfic to that effect.