Hey mate welcome from the Gold Coast , i'd just like to suggest before you go changing tunes or spending money on bits and pieces you test for vacuum leaks 1st. I say this because i went through the exact same drama on my bike until i eventually found the front throttle body to head rubber boot was split and leaking , to check this have the bike warm and idling , grab the throttle bodies and give them a good wiggle up and down , you can also try spraying aerostart around each boot as you do this , revs should fluctuate if the boot is sucking the aeorstart mixture in.
Also off each throttle body there is a small vacuum host that that runs to a sensor , these can perish and cause vacuum leaks , silicone hose can be bought from Supercheap auto , makes sure when replacing you cut all 3 pieces the exact same length and re route them so the dont get squished when stitching her up .