I'd rather have the OLED screen than a little extra battery.

I'd get the original with the OLED screen. I'm actually pretty damn happy with the battery life on it so the extra hour doesn't mean much to me, so for the same price I'd go with the better screen.

Don't rush things:
OLED displays are different one from another and some of them have very different little problems, for example there is a picture of Uncharted and it look beautiful on the LCD version because that particular OLED display has a green tint in black areas. OLED is not perfectly manifactured, LCD quality of production has less bad surprises in my opinion. Still: get the old one, especially the 3G MODEL! remember that with OLED you might see more imperfections in games graphics and might make you think graphic isn't that good. (fire in Uncharted)

PS: I've heard someone stating he lost a bit of brightness since the vita was new. (I can't confirm this, I was luky and have only splash effect on some pixel areas when turn off console and the screen is completely black you can see gray areas, it's ORGANIC's problem/imperfections)

I recommend buying 3G model!!!!! nice addition when you need it, also same price!
Remember 3G model has built-in GPS antenna for NEAR smooth experience!