This is what I currently have.
Only things I can think of to upgrade are bowfa/crystal or claws or kodai/ancestral or implings for clues because I freakin' love clues