I would go back to Capture NX2 and get familiar with the interface. Like you I didn't care for the interface in the beginning. But I found the value of how it handled raw files much more important than the way CS5 looked. With increased use I now really like how CNX2 works. I have never used Lightroom but I think the latest version may be useful for your vignetting problem as well.