To add to your first point, two of the best remaining guys, Michael Elgin & Kevin Steen, are rumored to be having WWE try outs at the next camp.
TNA should dig to that "second level", because you are right about the top tier indie guys. Many people tell me a lot of those guys avoid TNA like the plague for the reasons you stated.
Elgin should be gone already. Steen is probably going to get Cabana'd for some reason or another. Bennett and Cole probably have shots at WWE. Gargano may be in the Aries range where TNA could become a viable option only because WWE doesn't show interest forever. Who else is a top indy? Sami Callahan, but I know how you feel about him. I don't think he'd go to TNA.