Okay, so that's clear now.
What I can tell you from experience with my setup, which is identical. I removed that drain-pan and did a lot of work to patch the drain holes. It is now leaking again, so I'm just going to replace it - so I think you've got the right idea.
Note: The drainpan...