After a week of hunting for part numbers and tracking down parts I finally got my boxes fitted.
So in case anyone asks again, yes the old 2014 mounting kit and panniers will fit the 2017/18 model but if you plan to use the panniers with a givi top box you'll need to source your own bolts for the Givi rack support bars, they will require 35 to 40mm bolts instead of the supplied 25mm ones.
You can see the support bar I mentioned in the last picture, they line up behind the lower left bolt on the pannier mount.