Something is wrong with your diagnosis, or your settings. If you return the needle to stock position, and bump only the main, screws standard, you should not be overly rich.
In stock configuration, these bikes are lean at WOT. Upping the mains solves that, especially when coupled with a more open exhaust. Your pilot jets are on the rich side at stock, so leave them be. The stock airbox should eliminate the need for crazy adjustments with the screws. So I would basically put everything back to stock, pull some plug chops at 1/2 and 4/4 throttle and adjust based upon that. Tinkering with too many settings simultaneously will lead you in the wrong direction as each change creates dependencies.