Revamping FHE

My son turns 8 in a year!  8!  Accountability, covenants with Heavenly Father, and the gift of the Holy Ghost.  Parenting just got a lot more serious for me.  Up until now, Family Home Evening has been mostly about time together and having fun.  We'll get ice cream, play a game, and read a scripture and pray.  But I was recently talking to a friend who has a daughter the same age as mine and we talked about how weird it was that they'll be baptized in a year and the full weight of that sunk in to us.  I just don't want him to be baptized because "everyone else is" or because it's expected of him.  I have told him it's his choice and I stand by that.  And I also believe it needs to be an informed choice.
I think the best place for this teaching is Family Home Evening, but I've been a little lost on where to start.  We've often used the Gospel Art Kit for FHE lessons, but that just didn't seem like enough for me with this.  So after my friend blogged about this, someone commented and suggested using Preach My Gospel.  I love the idea so much I wanted to tell you about it.  I seems like such a perfect way to teach him what he needs to know before making this important decision. 
Parneting is so scary sometimes.  One year after baptism he'll turn 9, halfway through his childhood.  Have I taught him enough?  Does he know the important things, that he can trust me, that he can trust God?  I worry that he doesn't think so with the ways I've lost my temper and I really need to fix that.  I suppose that's for another post though....