Remapping The Rs

My RS has always had a lumpy idle, fluctuating and never steady. I also notice that when pulling away gently it stutters then suddenly it will surge. It almost feels like it’s a fuelling problem. I did take it into triumph for the idle issue, who thought it may be an air leak and they tinkered with it but it is still doing it. I can kind of live with the idle but I was wondering if a remap from Hilltop would fix the stutter when pulling away?