The angle on the 1000 master cylinder banjo is different from the 800. The orientation of the banjo bolt is the same, but the banjo angle is different. Strange. My guess is that the 1000 lines will work, but if that's not good enough for you -> custom lines
Caliper bolts - ProBolt have them. Easy to strip the old ones. LOTS of WD40 or similar. Leave for a day or two. Replace one at a time to avoid air in the calipers.