More time in the water is what I would have liked to see but how can you cover that amount of information in five days. Extend the class to 7 days and water time would sure increase. Of course that's going to cost more and take up more of our time.
The long days can wear on you, but that's not limited to just fundies. I've done a couple of courses that ran for a week and went all day.