Definitely, the whole Fred and Wesley story is so sad it's hard to even think about sometimes. It was also one of the things that benefited most from extension in the After the Fall series--I was glad they gave them such a good sendoff.
I think Wesley was intended to be killed off after only a few episodes on Buffy, as Spike was originally. Thank goodness both of them got to stay on and evolve so much over the course of both shows.