E30 Zone

Iv been flying around with my m52 conversion for years now but I have never really sorted a proper dipstick setup. When I installed the conversion I had issues with leaking oil around the base of the dipstick tube but I sorted it with o-rings and some rubber pipe bits. Thats held together for a while but now that Im running a supercharger I find a fair bit of oil leaking in this area. I do have a pipe coming off the dipsticks base so there is an outlet for any positive pressure and gasses. I just run this pipe upwards and have a small filter attached.

So my question is, what is the proper setup to use on an m52 with e34 sump in an e30?

The e34 setup with the e34 dipstick and cut out an area for the breather and not cut the tube in half. Then weld the m52 pipe to it for the oil breather setup