How strong is that current in the tank? If it's too strong and you see him struggling, turn it off until you can create a decent baffle.
I hate those ugly bottle baffles and pantyhose, so I buy the silk ivy plants with flexible stem things, and I make a loop around the intake and then wrapped sort of around the heater on the other side of the filter so the leaves make a sort of baffle. It is sort of hard to explain, so if you want, I could post a picture showing what it looks like. I also use a good bit of live plants by the filter to slow down the current :)