Getting back to basics is a good thing. In the zeal to get people finished fast or when picking a student up from a different instructor I've noticed that something critical was missed and is now painfully obvious.

I'd break it down a bit like you're doing, then build back up with an emphasis on flying the plane first and foremost.