Carbon fork probably not much 'upgrade', it may screws up your bike handling by changing in fork rake (trail) so be careful playing with a new fork.

New wheel seems obvious better choice.