If the colors are showing true, and that block is indeed brighter and more "Christmassy" in tone, I think I would also change it out.
As for having the three blocks that are not square in a square, I am good with that, as I like a little change up here and there in my quilts sometimes. I might separate the two that are touching a little more though.