Anime News Network has the next few episode titles up, and they do not sound like non-filler episodes. Based on this, I doubt this next weeks episode will be the last filler. That being said, they could be wrong on their episode titles list, it's just more likely that DB was joking.