Yep in total agreement with risner that its not that easy actually and when HL does fix it hopefully it will fix all the polymorpth spell affects at the same time.
You may also wish to take at look at my
adjustments addon. Its not specifically made for Wildshape but it does have allot of adjustments that allow one to add "natural" attacks to a character. You may find just setting up a bunch of adjustments to turn on/off useful.
Update: my gaming addon now has Beast Shape spell adjustments.
