That is a good one! We are doing something similar.
We have also taught tricks by just shaping behaviors with the clicker, no luring, none of me showing him what to do, that's a big brain boost. I also like to hide toys and food in increasingly difficult areas. I also find safe things that do scare my dog and encourage him to work through it, praising and playing big time when he does.
A really big confidence boost is teaching games that has the dog doing a job. When you are carrying laundry and drop a sock, having your dog come and fetch it is very helpful, not to mention I do think the dogs feel some sense of satisfaction when they know they have done well and helped.
Mine will take stuff I had over to him and toss it in the wastebasket (still a work in progress) and will also put his toys away. His demeanor really changes when he knows he is doing a job that is appreciated.