Zen,
Maybe you can put a spacer between the rotor hub and bearing, that'll push the rotor out a little. It'll have to be a hardened and ground spacer. You can modify another inner bearing race. In order to get enough thread engagement for the axle nut, you may have to then trim the snout of the hub. The caliper would have to move accordingly.
Take a look, if it's not hitting too bad that may be an option.
If it's not an option to mess with the CB stuff, then I guess it's 944NA time.
Easy,
Lanner