I'd split the difference, get something in between and try that. If you think you can make that big of a jump again... then get the 13.
For the record, 17mi commuting on fixed is no issue. I really don't drop much time when I take the geared bike (when I do, it's cause I'm pushing that much harder). I do 15mi on a 48x17... all flat.