Ash - He's castrated.
Trim both of their whiskers back by at least an inch. Whiskers and dominance go hand in hand for some odd reason, so when you trim the whiskers back, it can help.
Completely clean the cages with hot water and white vinegar. Wash all the hammocks and boil and bake the wood products (or boil and throw them out in the sun until dry). Make the cage completely nonterritorial, where neither of them have hung out before.
Put a dab of vanilla on both of their noses and some around their tail, towards the butt.
Put them in the cage together with two houses, so they can get away from each other, as well as a dust bath to share, a big pile of hay, and some new chews or toys to gnaw on. Put them together on a Saturday morning when you know you will be home from school, and when they should sleep most of the day. In the evening, before you go to bed, separate them in to different cages. Sunday morning, put them back together again, using the vanilla and the dust bath and hay. Sunday night, separate in to opposite cages.
Monday when you get home from school, put them together. Are they in your room? If they are, leave them together all night, remembering to use the vanilla just above the nose and just above the tail. Use the same dust bath again (where they are mixing their scents). Normally you wouldn't do dust baths this often, but I suspect part of the problem is that your male still smells like vets office and it's upsetting your female. If they get along well on Monday night with no scuffles, and you feel comfortable leaving them together, let them sleep together during the day on Tuesday. "Usually" they sleep well during the day and there are no fights (there are always exceptions to any rule). A little scuffling is always possible, i.e., some barking and kacking. Lots of fur pulling, chasing, or, obviously, blood shed are not acceptable.
If you can get a hold of a small wire cage that will fit inside the critter nation, you can do the cage within a cage intro, which has always worked for me.
