Something I may try if a 2011 filler neck can't be made to work: I sourced a PVC pipe fitting with a threaded opening to screw the 90 degree fitting into. The neck fits well into the opening and with a bead of silicone adhesive caulk to seal could work, but seems kinda' ghetto to me, like duct tape and baling wire.
IMG_1007.JPG
IMG_1008.JPG
IMG_1009.JPG
I could use the supplied filler neck for the regular Z. It mounts on the opposite side (driver) from the bottle but with a couple of fittings and a long hose might work.
IMG_1012.JPG