Cardio should be fit into your schedule based on what you want (bulk vs cut) and so on and which is more important to you. What you are doing now isn't bad. The 10 minutes before is more of a warmup than anything else and you are doing the cardio after the weights which is much better for muscle gains in my opinion as you have more energy for weight training since you haven't spent it all on cardio before your workout.
