Honestly man if your "shapelessness" is just starting to disappear above the waist, you probably aren't harming yourself by losing weight, assuming you're doing it slowly. Definition/tone is more a function of body fat than pushups. Especially since you're saying you are at PR watts and such.