My experience so far has been pretty similar to most others with the stalling issue.
I had that issue since new and it kind of got worse recently (I am currently at approximately 6000miles). The bike would usually stall at the initial start (won't idle) and would have to start it a couple of times, give it some gas and it would stay on. Then it would usually die coming to a stop, and when taking off from a stop sign, red light.
What made improvements on mine?
I took AZ Mtn Girl ' s advice and drained my tank, found some 1" paint chips, some smaller ones, a little piece of aluminum foil, and some tiny traces of sand. I went ahead and got fresh high-grade gas, Startron, refilled the tank, installed a new OEM spark plug and it is leaps and bounds better already. Instead of dying 3-4 times, it down to dying only when I go to start the bike.
Another fellow rider on adv-rider forum shared a picture of his/her fuel pump filter assembly and it seemed pretty gunked up, they had only 7miles on the bike.
A lot of people have noted big improvements with an iridium spark plug. Some have commented on the battery and the side stand switch.
I will be going with an iridium spark plug myself and hopefully, it further improves the situation. As of right now the bike is running really good, and I would consider stalling to be an issue only 5% of the riding time. I can easily live with how it is right now!
Your plan sounds like a good starting point and add an iridium spark plug as others have noted improvements. Check for loose clamps on the intake boots as well..