With an inseam as long as yours, at your height, I'd definitely go for the 48 bike.
I'm 5'9" with a 34 inseam, and I ride a
52 with a 1cm longer stem and it's perfect. I suspect for you you might end up needing a slightly longer stem, but that's an easy adjustment. With the length of your legs, you might need a longer seatpost, too, depending on what comes on the bike. (I suspect that's why your legs felt cramped on the smaller bike: seat not set high enough either because it simply wasn't, or there wasn't enough seatpost to get it high enough.)
If the women's models fit you there no reason not to get one unless the color turns you off. Usually not much of a difference except sometimes saddle and--most importantly for your proportions--top tube length.
I wouldn't worry about the fit of the smaller bike being too "aggressive" because you can always leave in spacers or flip the stem up. And if the price is right on that yellow "women's" model, I'd say go for that.
Go for the 48. It'll be lighter, too!