Platypus, many of us have tried to debate the topic of evolution under the definitions you mentioned only top be rudely told, no, "evolution" just means heritable change or something along those lines.
Is that the wrong definition of evolution? Alleles shifting in a population and all that....?
I like like your definition just fine. I think it's very clear when people debate evolution, they are referring to universal common descent via NeoDarwinism, and not just heritable change.