I found a few ways to make removing and installing the intake elbow MUCH easier.

I found it "rather difficult" to get the intake elbow out and back in the first time so I made the following minute mods:

Wherever the metal was shiny from rubbing I ground away a tiny bit (maybe only 1 mm) of material and that made the elbow drop right in vs really having to cuss at it. I also slightly rounded off the bottom of where the side bolts go in to help guide it into place. I left the dimension of left to right the same, just rounded the bottoms-see photos.

Also, the two hoses attaching the EGR benefited from being cut down a little bit to give a small amount of wiggle room for fitting. I also changed the clamps to regular hose clamps that are accessible from above with a small 1/4 drive socket when installed. I just find this was easier than the stock spring clamps to get back on correctly.

Along these same lines I replaced the clamp on the hose thingy near the front of the engine (see photo) with a regular hose clamp for the same reason.

Now the elbow drops right in without fuss.