OK, if you have friction shifting it's unlikely your cables & DRs are set up incorectly. You can manually adjust the position of the shifter to eliminate any rubbing noises while you're riding and friction shifters are very unfussy. Older and slower than indexed but much easier to maintain & use when things aren't just perfect.

What was the bike shop adjusting for you that "fixed" your situation, even if temporarily?