I think baffles are a must and easy to do with the engine in place. The head drain is debatable and there is a massive discussion on the merits of this in the FI section.
I'm a bit sceptical about the merits of that design of catch can as it will only drain back when the engine is not under load. When you are out on the track, if you have engine that breathes a bit, then it's going to get full pretty quickly and pump a load of oil into your intake.
But if Canute has seen a better solution using another catch can along with the JJR one then it might be an option for you. Having two catch cans in the engine bay would give me the shits. Maybe Canute can post up a pic of his engine bay so we can see how it looks.