I'd concentrate on the carb. Sounds like you just need to drop down on your main jets & metering rods to pull back the fuel. Since it runs good after you've cleared it out it sounds like the accelerator pump is doing OK, you're just running rich, IMO.