Primary, fluid, secondary, and tertiary block settings independant to biomes

Right now, I am unable to make good looking oceans unless I choose water as my fluid block for the dimension. The reason I have air set as my fluid block is that I have a canyon biome in the same dimension that has awful looking water generating above the canyon that doesn't even fall. Being able to set the different block types for each biome would be really nice. Note that this ugly water generates even when I have lakes disabled. A little more customization over default and internal generations would be appreciated too.