You are behind on Kernel which added some benefits for your 6800s, but might actually complicate your 6800XT efforts. See posts by user oni running a non-XT/XT rig like yours on latest.
In my opinion, you can be getting more out of the 6800’s on new kernel with your level of wattage. But the XT complication is one to navigate.