I've always found it helpful to identify the chords, their directions, and the matching melody side chord tones for the keys in question. Focusing only on a pull scale is fine if you have magic bellows that go on forever and you don't intend to play any chords. If I'm trying to play in the key of E major, I know I'm going to want to be showing off E major, A major and B major a lot, and for me, it's those that will be the framework of a tune.
So really I think about how I'm going to want to play B, D# and F# over a push B major chord, and so with eg a D# E F# run, I would pick an E that'll be easiest to use to get my hand around the instrument. That might be a push reversal for E, or, that might be a push-pull-push sequence - there's a pull E and a push F# on the same button, after all.
Reversals will push those limiting margins of having only 1 pull and push version of a note away from your home keys. Playing in more distant key signatures like this is like taking a step towards those margins, and is going to introduce 'but my button only goes one way' kinds of challenges once again. It's the nature of the game, but, I don't really see a reason you shouldn't be able to conquer it.
Typically these keys are both very pull heavy, meaning you'll want to look for opportunities to press the bellows to empty your air out. In Am, you can press the bellows with a C chord and Dm chord, so, I think you'll always be dealing with some strange shapes due to simply chasing air, so I wouldn't worry about your layout.