As I get a little Better in various aspects of my freestyle

Something I identified

1. My roll to air isn't perfect but adequate 80% of the time
2. I notice my INhale is

A. Still a bit panicked
B. I "think" I am taking Waaay to big of a breath as if I'm gasping for air...thus.
C. B may be causing me to hold my breath ever slightly causing me issues and thus making a 25Meter length still a struggle

My legs/hips/head all seem adequate

Any drills/suggestions?