From what i have been reading the problem is near the hatch area, so i was wondering, what if you put a pantera style hatch and a whale tail on the pantera hatch right where it drops down. It wouldnt look nice but would be effective i think.
something like this kind of, this is a very crude drawing so you can get an idea of what im thinking.