hi, Your breakdown of the hour sounds pretty good nice variety and your lucky that you get to do partner drills with a skilled guy! in answer to your question - what to do in an hour my advice would be firstly quality over quantity. make sure you are constantly focusing on developing technique and timing etc. secondly , id say have a focus. take 20 mins to sit down at the beginning of the week and plan it out . an example of a focus could be , speed, power, combos, footwork, stamina etc. depending on how many days you are working out each week you can focus of on or 2 things. then for each workout make sure all the drills are designed to work on an element of that focus . ie foot work - you can do step drills, skipping, shadow with only footwork, shadow moving and hitting, defending with only footwork , you get the idea ! probably what you are already doing - just my 2 cents worth.
cheers