Omg, the expansion you're working on sounds AWESOME!!! Can't wait. Until then, the two solutions you've described sound like a great starting point for some house rules. Thank you so much! I'll for sure report back when we get around to playing.
