RE: Over Heating??? Ugh
Really looks to me like that baffling is restricting the airflow too much. Instead of using baffles to cool the motor, have you considered adding more airflow by opening a couple small cheek holes if there is strength enough in the nose. From the picture it almost looks like there are marks for a cutout just along side the front of the motor already. And, of course, I hope you'll let us all know how you work it out either way.
Joe