So I fiddled around a bit and now my deck looks like this:
4vj 4vj 4vj 4vj 4vj 4vm 4vm 4vm 5de 5de 5de 5de 5l9 5l9 5l9 5l9 5rg 5rg 5rg 5rg 5rg 5rg 5rg 5rh 5rh 5rh 5rh 5rh 5rh 5rl
The biggest danger now is either not drawing an elf for a long time or drawing nothing but pillars and pendulums for the first several turns (both have happened already).