Bruce,  You asked about organ figures.  I bought a beauty from England
(with no arms, though) and got it repaired by The Layton Studio in PA.
They did a very nice job.  I'm painting it myself.  I might suggest you
look to Europe and get a new wood figure.  Here are some sources (all of
whom speak English):

  Albert Timmerman
  Orangestr. 32
  7951 BH STAPHORST
  Netherlands

(A good wood carver who does all of Henk Veeningen's facades, Albert will
hand-carve figures of most any type for 2500 Dutch Florins each.)

  Jan van Eyk
  Twelloseweg 77
  7396 BM TERWOLDE
  Netherlands

(Jan uses a duplicating machine to make several different figures,
including conductors. I think they cost around $750 US unpainted.
He also paints figures.)

  Roger Zietz
  Eiser 6
  25499 TANGSTEDT
  Germany

(Roger also uses a carving machine and has numerous masters to produce
figures.)

Is your Gavioli playing?  Mike Kitner just finished the wind chest for my
(formerly your) Bruder.  It was very wormy, but now it looks almost like
new.  He also did the bellows.  I have the facade in primer now.  It has
taken a lot of time to get to this point, but it's coming along.

Phil Jamison