Thanks for the input Redwood. So if I'm understanding correctly, you suggest I shorten that red section and I should raise the trap section as well?
I'm a bit confused by your last statement though, about extending through the roof and the AAV? Also in the first photo, the red section...