But to answer your question, how do make it better?
My MMA class is something like this:
15 minutes warm-ups and stretching.
30 minutes of instruction and "walking through" the techniques being discussed with a partner
30 minutes of sparring.
Sometimes it's "situational" where I start in Position A and have to move to Submission C while my opponent has a similar gameplan to defend and/or change postition.
Sometimes it's free form where we start standing, but don't kick or punch. Go for the throw/takedown, work for submission, repeat for 5 minutes....
Sometimes it's San Shou rules (yeah, in MMA) boxing rounds with 14oz gloves, shin pads, etc...
Sometimes it's medium contact with the 4oz gloves and no protection.
15 minutes of combat conditioning -- sprints, etc..