Replying to New boots

Hey NS looking for some boot advice. So i bought a pair of USED FT classics two years ago and heat molded them. I love them, they're great and comfy. All the buckles are broken on the right foot and have been epoxy'd into a set place. Anyways they have the original tongue and I think I need a boot with a stiffer tongue. So my question is, should I get new boots (with footbeds and the whole shabang) or should I get a stiffer tongue and replace the buckles?