Welcome back and glad to hear all is well after the fireworks and all.
The grinder definitely needs larger diameter sprockets but I don't think you'll need to up the speed. Can you also maybe change the bottom of the drive from a flat surface to something more knife edge or tapered a bit.
How much larger of sprockets are you thinking of using?
The hammer,
But you need more speed there for sure.
.
Keep it up, looks great!