replacing boot buckles

I have a pair of dynafit boots, on which, i have bent 2 out of the 6 buckles on both boots. The plate holding the lever, where the lever piece is riveted to the boot is bent.. Does anyone have any recommendations of where to get and how to install new ones? Should I just send them back for a warranty repair - i'm afraid they'll just put the same buckles on again.

Strurtevant's in Bellevue replaced a buckle on a Scarpa Lazer for me. They ordered the part, installed it (special tool required) and tuned up both boots for the cost of the part and a pittance in labor.

Second that for Stuartevants in B-vue. Just had a buckle replaced there this morning actually, they did it quickly while I waited....on an OLD pair of Nordica alpine boots too!

I've had a buckle or two replaced at Pro Ski on Aurora in Seattle. Still holds my boot to my feet, so seems like they did a fine job.

Jim Mates at Custom Boot in Ballard did a nice job with some Scarpas for me a few years back. Replaced one and tightened up the others very reasonably.