a carbon fork will definitely be an upgrade, but it wont be as noticeable a difference to comfort level as switching to 25's.
my SS came with 25's on it, and when i switched to 23's there was definitely a noticeable difference. you will sacrifice a little rolling resistance, but comfort-wise - its a better bang for the buck upgrade...