There's an easy answer to the drop rate issue. Add geodes as regular drops to their associated elementals like cluster.