I'm in the exact same situation as you are Paul, I'm still searching for a new bike too.
The Onza Bird looks like a good first choice in my opinion.
Frame wise I'd say it depends on your hight doesn't it? there's no point riding a bike that's too small for you.
I might be wrong seeing as I'm quite new to the game, but yeah, just thought I'd voice my opinion on the subject