I like the name Macho! I think it's super cute. I'd love to see pictures of the little boy!
I think giving it some time will make your pup sound, act and look like a Macho.
To put things in perspective: I had always kept the name Scoot in reserve if I ever got a boy dog. I thought it just sounded adorable, but then a friend told me it sounded like a dog who scoots his butt along the carpet because of poo stuck to his butt.
Needless to say the name Scoot lost its attraction.
So at least you don't have that problem!