The problem with the shop idea is that I am replacing the shifters that were on the bike when they put on the new derailleur. They won't install my shifters because I didn't buy them from their shop. So, If I get them to fix it, then change my shifters, I'll be back to where I started possibly. If I change my shifters, then take it back to them, they will blame the problem on the new shifters.
I have learned from dealing with all this. Next time, I'm driving the 200 miles trip to a Certified RANS dealer and getting it done right the first time.