Lots of threads on here about upgrading brakes, as the std Stom set up is poor in my opinion.
in truth there will only be a very small difference between wavey and standard rotors, with the wavy losing out slightly as it has less area to bite onto [but it is better at manageing heat, so wont distort](see note below). But dont think that dumping the wavy discks and going back to stock will fix your problem............it wont!
Problem in my opinion is down to the calipers & Master Cyl.
First you may want to strip and clean the calipers, making sure you remove all the seals and clean the grooves they sit in. That may be enough to bring the braking up to where you want, but if not the next step is to fit calipers with a bigger piston area, and a master cyl to suit [the hydraulic ratio is very important, a solid lever feel is not the same as strong brakes!]
From the research I did, the Honda CBR600f4 came up as the winner, but parts of early Blades and SP1 and 2 are virtually the same.
Link to this thread may help
http://www.haymouth.co.uk/phpBB3/viewto ... de#p123094
NOTE I am saying this even though I fitted wavy discs to mine as I had a slight judder problem on my discs after I fitted better calipers