Redirecting is what I usually do with him. Or, if he's really acting up I put him back. He still has all his feathers in spite of his raging hormones.
There's an avian tea from Greywood Manor called hormone havoc, I believe that's supposed to help. I haven't bought any to date, but it might be worth a try.