Instead of editing your clubs depending on which course you play. It might be easier to save course profiles for club layout. For example for BPB under optional clubs I may x, y, z for example, and for Kiawah, I may use a, b, c, and for St. Andrews, d, e and f. All this does is save time in editing your club selection.
I would also would like to club substitution in the iron section.