Wheels are a good upgrade; cranks aren't. Wheels improve your performance but cranks don't. Some things to consider that will help, at least in tersm of comfort, are saddle (get something suited to your likes and feel), seatpost (one that's light with fine adjustments and Thompson is an excellent choice), bar and stems (most likely the initial bike came with stock parts that weren't fitted to you), and pedals.