Dear Wonder:
I teach RCIA, but not in the way you describe. You might want to pick up a copy of the US Catholic Catechism for Adults. If you have any questions I can help with, I would be happy to.
The "RCIA ship" seems to be slowly righting itself. The parish where I went through RCIA has totally re-vamped the entire process with MUCH more relevant content. They basically pitched the "canned" RCIA program, and "rolled their own" based on true Catholic teaching.
I prefer the more universal "Catechism for the Catholic Church" over the "US Catholic Catechism for Adults". I'm of the opinion that the USCCA is still a bit "mushy" by comparison, while the CFCC is a masterpiece of clarity.