If this is the only bike in the stable... I would suggest none of the above. Save up and buy that bike that has what you want. Keep the Masi for the winter and as a backup.

If that doesn't apply.....

What do you dislike the most about the Masi and start with that first.