Managed to get some time in the garage this weekend and swapped the forks over. Luckily I've done this before on the DD bike so it took less than an hour start to finish.
A quick snap - the old calipers are still on the brake lines and the new calipers are in a box waiting to be fitted in this pic. I've converted the front wheel to run the 996R disks and it all lines up fine.
Next job is to get some spacers made up for the front wheel... but I've noticed that the banjo bolts on my brake lines are all corroded so I'd like to replace them as well...