I did the swap in my 810. I went the route of bending a new pickup tube and snipping a small piece of baffle from in the pan. Wasn't to bad at all and less room for a catastrophic error...cars still running. Let us know how it goes.
Do you have pics of what you did?