Finally finished. Geez, that took a while.

Repainted the gold and tidied up the paint job.