07 R1 won't idle when warm

[rustynutz]

My 07 R1 has developed a problem with idling when it's warm,this only happens sometimes,you have to really rev it to keep it running.It's got 6.5k miles on the clock running Akro end cans and decat y pipe and pc.I bought the bike set up like this,the last owner set the pc with a map he downloaded from their website,would a bit of dyno time and custom map cure this?