head sail track/inventory

Good Morning! This past weekend I met with my sailmaker down at my cal28 and as he was taking measurements we talked about headsail geometry (and because of it, I'm able follow along in the ongoing headsail thread!). The two headsails that I own are the original working jib and genoa that came with the boat in 1964. I explained how I have not been able to effectively heave to because the head sail is too big and it blows my bow off (with tiller locked to lee). The sail lies against the shrouds and chafes. I am looking for a better alternative, either in my technique or hardware or both. He suggested a smaller blade headsail and possibly a jib sheet track mounted midship and inboard of the spreaders. This would remove the chafe on sail and jib sheet when heaving too and also allow me to point higher. But how do I run the jib sheet from this block down to my jib sheet winches? He also suggested that I look at some other boats, cal 20's perhaps, and see what they do. That's where you guys come in :) Chrissssseessss! This is also my chance to update my sail inventory. I don't currently race and plan on cruising and would like to be well versed in light, medium, heavy and WINDY STORMY MADDNESS. I'm going hanks ( think!). How many head sails do I need? genoa, working, blade, storm? Should I consider a solent stay for the storm jib? I've included a top down picture of the boat. In blue are my current jib sheet tracks. Red, where I've seen cal 20's place theirs, and in orange, a proposal for a new track for a smaller blade head sail that would sheet inboard of the shrouds, allow me to heave to and point higher. Thanks, Adam