Found the brake issue today, removed the o/s/f disc as I was pretty sure just from driving it that this was the one causing the issue.
Pretty soon became clear why.
Big defect on the hub face, whoever fitted them needs to go to spec savers
So flat filed it and cleaned it up, all built back up.
Feel much better now