Go with whatever makes you happy, my carb parts offer is still good, just drop me an email with your address.
Most of the 40's I have had on my test stand would turn a Rev-Up 11-7 wide open at about 9 grand on YS 20-20. You can start with it wide open then work your way down. Screw in the choke then readjust the needle, keep repeating Choke->Needle till it is running about 8400. Fly the airplane and fine tune the RPM for the lap times you and the airplane are happy. The optimum RPM setting will depend on the prop, airplane, fuel, line length and your flying style. I personally like 5 to 5.2 second laps and adjust everything to get the airplane happy at the speed I am comfortable flying at.
As I eluded to earlier, you might check how your intake was modified. If whoever did the mod didn't cut down the spigot you will probably not be able to choke it down enough. The above photo shown just how much choke area I ended up with on what is basically a Brodak P-40. If he drilled a hole in the end of the nylon screw to clear the spigot the fuel has to make a 90 deg turn before it can get to the engine, I can't see this as anything but trouble. I have also said many times, 4 strokes need to suck as much fuel as possible on that intake stroke. Do everything you can to allow the engine to easily get fuel. No castor, low viscosity oil, high nitro (for a big bang) and tank plumbing with no restrictions.