I'd like to add that Dadam is the mightiest dwarf in the fortress right now. He's near Legendary in Bookkeeping and Engraving, and punched a kobold hard enough to make it explode. I put the artifact mechanism in his office - his profile reads, "He conducted a meeting in a setting worthy of legends recently." After, "He has taken joy in slaughter recently."
Awesome. It's always so strange how adding up numbers and counting seeds makes you into Batman.
Re: Goblins. Good! I'm glad that they are hostile. That gives us something to look forward to with regards to difficulties. It also sounds like you are having some problems with regards to the tree farm. If it's not already a complete loss, you could always just expand the area it contains sevenfold. That is, if the place is sealed from the water source, dig out a huge area around it and then breach the wall. The water will pour out and equalize to (hopefully) 1/7, and then dry up pretty quickly.
There are also more sane ways of doing that, I'm sure.