You're on the right track Dave and your upright setup is good. Your prop size should be just fine too; the 18" diameter is a bit big but you are going lower on pitch. I think as someone pointed out, the top of your low speed needle screw should be flush with the face of the throttle arm. It is probably set there already. A good starting setting for your high speed needle is 4 turns out from closed. You do that on your test stand and you'll get it dialed in nicely from there. Good luck and let us know how it goes.
Lars