Thanks for the suggestions so far. I chose the jawlock models because 1) they seem to be lighter and 2) reviews thus far seem to be quite good, especially the one on the P18/X20 where the reviews say they're as good as being fixed frames. Plus I don't think I'll be folding THAT often, probably will only need to fold 20% of my trips.
Is it possible to add disc brake on the Dash?