I was thinking, You can move that battery box back.
It only has a couple bolts holding it on, this would allow you to get a straighter shot to the fender.
I'm sure you can rig up some sort of true CAI I've seen it on other GA's w/2.4.
Remember, modding isnt cheap!