I wouldn't recommend upgrading your current bike. The expense of a new fork and shock will be more than a new bike. The suspension design of the Diamondback is not the best as it is a single high pivot. Do you have a bike shop you could demo some other designs before buying something new?