Daniel,
The first choice you need to make is - one mast or two?
With your 36ft boat, the usual choice would be for two masts, but it does mean that you have to buy, make, use, two of everything - masts, sails halyards etc. I have one mast on Tystie now, but I freely admit that this is pushing the limits of a one mast rig as far as they will go. The work to set up and use the sail can be heavy.
A one mast junk rig will work better to windward, mostly because of the lack of interference by one sail on the other, but also because a more effective sail shape is possible (fanned shapes). I have not been able to design a two mast junk rig that could could compete with a one mast rig, without going to too much complexity in the form of soft wingsails. Fanned sails, because they need a greater fore and aft space than Hasler sails, can only be used on one mast rigs and two mast rigs where the boat is very long in relation to its displacement, so that there is no need for big sails/ plenty of room for sheeting small sails.
So for a two mast rig, your best choice is of sails with parallelogram lower panels, perhaps with an intermediate, transitional quadrilateral panel (the way Arne does it), followed by one (Van Loan), two or three (Hasler) triangular panels. We all have our own ideas on how to add camber, and how much, and where, so we'll leave that aside for the moment, except to say that camber of some sort really ought to be added to a sail that is intended to sail well to weather.
For a one mast rig, you can still use that form of sail, but you can add a "fantail" shape to the list of possibles, if you like the look of it. It works well, but it is still in its infancy, and we are still experimenting with ways to rig it to best effect. It is not yet proven for offshore reliability, but I am proposing to rectify that with a passage from NZ northwards this year.
Battens and yards - I think we can agree that they should be made from tubular material, to get the best stiffness/strength/weight characteristics. The easiest to get hold of in most places is aluminium alloy, and you are looking for 6000 series that has been fully heat treated, and will be described as being to T6 temper. T8 temper, which means that it has been cold drawn, is stronger, but will fail catastrophically if overloaded, rather than just bending, as T6 does. T5, not fully hardened, is not a good choice.
In some countries, pultruded GRP round tube is available, and is an alternative that can be compared to alloy, though it needs to be painted because it is abrasive. Flat GRP bar cannot be used, being too flexible, and square GRP tube tends to chafe the sail.