Is the crank hitting, or the chainring? Not that it matters because either way, the wider BB will help.

As for Q factor, I always wanted the tiniest Q factor I could get until I was inadvertently forced to ride something wider. My knees loved it. I am not talking super wide.

I have gone through what you are going through and it was a quagmire of Octalink v1 versus v2 and it was a headache.