I remember a previous thread of yours:
Just to give you a reality check, you've made poor progress these last eight months. From that last thread until now, you've gained about 35 pounds of bodyweight with no real strength increase.
I recommend you drop what you're doing and use the program I suggested back then:
Mon., Wed., and Fri.
Squat 2x15 (No weight, keep both feet flat on the floor)
Push-up 2x15 (On your toes, not your knees. Put your hands up on a bench or Smith machine bar set high enough)
Lunge 2x15 (Alternate legs, 1 rep left/1 rep right)
Neutral-grip pull-up 2x15 (on the assisted machine. Could be substituted with inverted rows)
Plank 2x15-count (Hold the top part of a push-up, on the toes, arms straight, hands on the floor, keep the whole body straight. Count to 15)
Burpee/squat thrust 2x15
When those workouts are "easy" from start to finish, then you can progress to a basic free weight-centered plan.
Try to be "active" on the days you're not training. Don't stress about doing "cardio" specifically. Just... move... more.
You overthink things. You did back in February and you still kinda are. That you're tracking your bodyfat percentage is one example of this.
Stop it. Train most days of the week and eat good food often. That's as simple as it can be. (Just to re-emphasize the point.)
Hard boil a dozen eggs at the start of each week. Boom... no excuses.
Dare I ask, what exactly do you have "pre and post?"
Sounds fine enough, overall. At your age, simply increasing activity (as others have said and, again, as I suggested to you way back in February) will get you closer to where you want to be. You need to train smart and not get hung up on too many details.