I dunno if you've experienced this but the 4M sump is so shit, under heavy braking the oil fucks off from the pickup so definitely whip some better baffles in there.
How different is the 7M pump from the 5M? I managed to combine pieces of both 4 and 5M pumps to bolt right in, don't think I had to fuck with the crossover pipe either.