I was reluctant to override shape, as I didn't want to change the basic shape of the object, but I'll try only overriding it when it's selected, and see how that works.

Thanks.