My amp is only about a month old, If I let the magic smoke out I pay for it so will wait until after warranty is up.

If you use shielded wire it will remove the hum introduced by the wire but not any other parts, whereas if you shield the cavities it will remove all or you can do both and be really sure.