In my opinion i would go for a Sunday.I got 1 recently
A 21" toptube with a 13.75" rear end and it is a dream to ride.
Obviously your choice of frame depends on what terrain you plan to ride.For me personally its Street,Street,Street.
Next time you go out riding with some friends,ride each others bikes for a bit of variation.It is to easy to get used to your own bike and be content with it.
Before i got my Sunday i was real happy riding a Gusset Streaker, 20.5" top tube with a 14.25" rear end,
Now i have my Sunday frame i get more pop,can manual better and the overall feel of the bike is so much more stable.
I think i will stick with 21" Toptubes.
However i am over 30 and just under 6Ft
As i said this is just my opinion