In terms of the subcommittee structure, it's lined up quite nicely in the procedural data here: “be composed of the Chair, the two Vice-Chairs and a member of the other opposition party”. If you're going to go to the entire committee, I think you defeat the purpose of having the subcommittee on agenda and procedure.
Now, whether or not the parliamentary secretary is part of that is entirely up to this group, but I think we should maintain what we've had from the beginning so that you don't have long, extended meetings that are out of control. We just need to have what we had on here before. We just elected two vice-chairs, we have a chair, and with one member from the opposition, that would do it up right.