In The Hobbit, to a certain extent, certainly. Gimli is pretty much just a stone badass in TLotR, tho, because Merry and Pippin were around to supply all needed comic relief.

I'm worried that, given how Gimli was treated, it's going to be taken way over the top here.

I must admit to a significant bias here, tho. Just as you call yourself a very tall Hobbit, I often refer to myself as the tallest Dwarf in America. Dwarven characters in fantasy have always resonated very strongly with me, as serious, solid characters, not goofy. Funny Dwarves can still be done, but it needs to be handled well, and I'm afraid that adjectives like goofy, zany, whacky, and madcap are going to be more appropriate here.