@Ravi Kempaiah thanks for the great input. I decided on the Six50 E2, special ordered at the LBS and ordered a bodyfloat seatpost. The Supernova looks awesome but will have to wait on that for now.
Thanks for the suggestion on changing the front chainring to a 20T, that's definitely do-able!