I don't mind some vignetting, but I want to avoid the "looking through a drinking straw" look.

Mounting at the 5mm aperture might be better from a light transmission standpoint, but it is the least convenient option. Checking the current setup with a flashlight and ground glass suggests significant vignetting. I'm going to make up another plate to try in the forward mounting point and see what it looks like.