I can suggest using the second approach handling the AddingContainerNode event and to cancel it for any fields you would like not to see in the pivot field list.
I hope this helps. Should you have further questions please do not hesitate to write back.