Does the bike fit you perfectly and do you love riding it? If yes, spend the money, first on a 12-28 cassette, then later on a compact chainset. If not, with your new knowledge, change it.If money wasn't an issue which way would you go? Think I might be a tad obssessed after two weeks cycling!