Hey Ryan,
What did you end up deciding?
Have you checked out the velodrome?
FWIW, you inspired me to get back cycle commuting. Our rides are incredibly similar. You can see for yourself (pictured below).
Hopping back on the 48x17, it reminds me how much of a trade off I'm making so I can climb hills. If I were stronger and in a flatter area like you, I'd be bumping that front chain ring as big as I could handle, then fine tuning the back.
Specialized Langster (2007) pictured September 2018