I think I like the original music better.
Although, I suppose it depends on your point of view. If you see it as, "Yes! Anakin is back!", then the happier music works. On the other hand, if your first thought is, "Holy shit! He's taking Vader's mask off!", then the original music is more fitting.