Carbon fork looks like a good upgrade.

A note on your brake lever and cable... If it works for you, then I guess no worries. But you have it set up all wrong. The cable housing is supposed to go into the lever, with the cable itself going through to the bracket, which is probably designed to use a "road" style of cable terminal, as opposed to your "mountain" style. (Just in case you're interested.)