Replace or wait? Study says swap all incandescent bulbs now, but hold on to CFLs

LED light bulbs are getting cheaper and more energy efficient every year. So, does it make sense to replace less-efficient bulbs with the latest light-emitting diodes now, or should you wait for future improvements and even lower costs?