Honestly, I think you're running up against the problem of early DF. Once you figure out how to make the little guys dig and you set up stable farming, there's this moment of "But what do I DO next?"
The answer is that you do whatever you want to do. The nature of the game is pretty free form compared to a lot of stuff out there. The wiki can give you a lot of answers about how to do things, but it can't really tell you what to do. You have to decide that for yourself.
So what do you want?
If you want a military, you can start guys training with wooden training weapons while you dig for better metals. You can build a danger room and even with leather armor and wooden swords, they can probably handle themselves.
If you want to buy things, start making things with your gold. You can make gold crafts, gold furniture, decorate your stone crafts in gold. Use it to buy leather, or steel, or cloth, or food.
I agree that it's a good idea to start a couple of dwarves smoothing out every piece of stone in your fort. They're pretty slow at first and it's a good way to raise your wealth.
If this was your first time with the elves and you're only in your 2nd year, you probably have some people on the way who aren't quite so friendly. Think about setting up defense - build walls, traps, bridges, channels, and fortifications so you're not caught off guard if/when enemies show up.
Mostly, though, this is something you'll have to decide for yourself. I remember feeling the same way, but DF is about what you *want* to do. There's no real direction to it; you have to provide that yourself.