It's summer time - we're supposed to be sailing not working! However:
Adding another part to the main sheet and a lead block to keep it off the rudder stock. - Completed and works well.
Trying to tame the outer jib with a 2 part sheet and also an experimental halyard arrangement so we can take it in without getting out on the bowsprit (it can be wet out there!). - 2 part sheet helps considerably, we decided to wait on the halyard arrangement
Ongoing improvements below - it's looking better already with a little paint. - Shelves installed in galley, engine enclosure much better, new paint and varnish;