Spreader rake setting and diamond tension depends on the mast section (wing mast or conventional, alu or carbon). I know some A-cat guys who tried to dial in diamond tension from older trim sheets. At the end the diamond wires were torn out of the mast base. So I strongly recommend to ask somebody in your club or a good sailmaker, who has expierence with that stuff (i.e. has a similar boat (e.g. A-cat)). If not possible, post here some pictures of your sail+mast in different trim settings.
Apart from that, I think that the luff-curve-outside-the-track-matching method gives you way to much pre-bend and a too flat sail. You want to match the luff curve inside the track, with full mainsheet, downhaul and rotator pointed backward. That's your strong wind setting and at this time you want to want to match the luff curve to mast curve and hence have a flat sail. Just my 2 cents about pre-bend, maybe there are other opinions around.
Cheers,
Klaus