Been working on this with Adrian for the last 3.5 months. Happy to answer any questions if I can.
What did you guys go with as a policy for handling or avoiding orphan blocks...
If you're referring to side chain blocks (which some people refer to as orphan blocks) we'll extend them to be the main chain should they win or leave them forever marked as side chain blocks. We aren't doing anything to explicitly avoid these either.