Looking really good so far JD
For the playfield touch ups I'd use some of the enamel paints from the model shop hopefully they will have very similar colors and there positions on the playfieldnyou should get away with wax as there not in the main area of play.
Almost got me tempted to restore my jungle princess cabinet