In reply to alexthefabulouscrimp:
Pretty much every brand has a bike suitable for what you want to do these days so there are dozens at least. Both of your choices would work fine. As said, go with your heart not head, decide how much you want to pay and choose.
There is limited stock so you do have to decide whether to get one and ride it or wait, probably till nearer Autumn for the exact one you want.