Take a look at a Fuji track bike if you can. There are two models. When I bought mine it was $100 less than the Pista. (The less expensive one) It handles like a dream.
It also has a set of bottle cage mounting holes.