Smaller genoa with cutter rig
I agree with your thought pattern on the genoa--you don't need a big one unless you sail in fairly light conditions most of the time, and then you wouldn't need the staysail. My gennie is a 110% with a fairly high-cut foot. With just a little practice, you'll be able to tack it over the staysail stay with no problems in all but the lightest air. Just let out the jibsheet a few feet as you come into the wind, so that a "pocket" of sailcloth forms between the forestay and the staysail stay. Then backwind it a bit as you come over.
With a 110% gennie, you might consider buying an asymmetrical spinnaker for reaching in lighter conditions. Easy to handle with a snuffer sock and ATM Tacker, even single-handed.