watch out for some of those aftermarket kits, odd sized jets, gaskets that dont fit and just generally not good.
not 100% if the parts are still available OEM. i had a stash that i used up so i guess i need to stock up again.
needle sounds about right.
also check the charging system as it can cause some funny things