I am a little bit mystified by the description of your proposed rig.
" I have decided to go with an Aero-Junk Rig (flat panels, rigid continuous battens with a fixed jiblet) to balance good windward performance with bulletproof mechanical simplicity."
Rigid continuous battens? My understanding of the aerojunk rig is that it has flat panels (main and jib) which take on some camber within the confines of double wishbone battens. I have seen three such rigs in New Zealand (the best-known being Pete Hill's Oryx). I think the first to develop this rig is Paul McKay and here is a photo of his Miranda with aerojunk rig.

Paul doesn't seem to follow this forum, but you can contact him via the membership list in the Members' Area of this website. He would be the go-to person for the Aerojunk rig.
("Rigid continuous battens" seems to suggest SJR (split junk rig), but building a SJR with flat panels would be a hopeless idea, and the virtue (or otherwise) of cambered SJR will depend entirely on the amount of balance relative to the mast, of the sail in question, which is as yet unknown).
(Another couple of confusing points - what is a "cascading" sheet system? What is the distance between the two masts? Where is bulkhead 2.5? Building a two-mast rig around that existing mainmast position might turn out to be a bit of a challenge).
I think the best advice would be to see if a plain, two-sail, junk rig outline can be drawn up on those mast positions you have chosen, with a combined CoE which matches the CoE of your original sail plan - and leave the question of type of junk rig until you have done that. You might also want to consider if you can be flexible about mast positions. I have doubts if a ketch rig can be built around that mainmast position, although a schooner just might.
But these are just geometric considerations. I am not a designer of rigs. I just put these discussion points and hope to bring your project back into general discussion.
One more thing: Here is a lengthy thread on a similar situation to yours, a 12m vessel where the owner wanted to build the rig around the original mainmast position. It has turned out to be possible (I think) and the project is now near to competion. One of the problems, in the end, was to get enough distance between the sails for a workable sheeting system. He may yet need to use port and starboard sheeting on the fore sail (not sure yet) which is a plan b, not a first choice. Have a look: https://www.junkrigassociation.org/technical_forum/13545697