Any tango shoes with buckles over the toes?

I am really struggling with shoes. I cannot find any that fit snugly. The strap over the toes floats in the air above them.

So, I was thinking, is there any model that has a buckle on the toe strap, so I can crank that down?

Bonus: with a square-ish front edge? The shape of the toe on my DNI Danas matches my foot. The shape of the toe on my Sur Graces is rounded, which means when I (inevitably) slide forward in them, my toes hang off the front edge.