216 and 235 distributors will bolt in and run the engine more or less interchangeably, at least for fit testing purposes. If you're getting point gap differences between lobes, the ones with the smaller gaps are showing wear on the cam. A one-degree change in "point dwell" (gap) changes the spark timing at the cylinder two degrees, so a measurable difference in gap isn't a good thing. It might be possible to mix and match parts between the 216 and 235 distributors to assemble one that combines the best parts of both of them. If you use the centrifugal advance parts like weights and springs from the 235, your timing advance should be correct, or very close to original. If you choose to use the 216 breaker cam, be sure to check the height of both parts. That piece determines whether a tall or short rotor and distributor cap needs to be used. Also compare the position of the breaker plates in their respective housings to see if you can swap housings.
I still think I'd do a little machining on the wobbly housing if necessary. Making a Frankenstein distributor from donor parts should be a last resort, mostly because of the fact that stovebolt parts in your part of the world are probably pretty scarce. Good luck!
Jerry