Increase frequency of grimstone caves please, oh and lava pockets

Normal caves spawn so frequently they intersect often enough to create complex networks you could potentially get lost in. Grimstone caves spawn so infrequently they intersect with the normal caves far more than they do each other. They hardly intersect and there are several portions of the world in which the grimstone underground will have only 1 or 2 caves within my render distance. I want to get lost in a grimstone cave network looking for diamonds, but right now I can only see myself coming across dead ends more often than not and instead just strip mining as always.

Additionally, could we get significantly larger than normal lava pockets in the grimstone underground?