Mark, I thought you had an 836?? For a 736, use 28mm chokes with similar jetting to my 836 with 30mm chokes, including the 35 pump jet.
As far as altitude, don't worry about it; my jetting is slightly rich, other than what I already mentioned about the air jets with the 3.5 aux. When the altitude goes up, the air is less dense; a given volume weighs less, while gasoline weighs the same. That less dense air pulls less fuel through the main circuit, so the effect is less than most people think, at least as far as A/F ratio goes. The total effect on power output is a hard and fast rule of physics, and can't be overcome with jetting.