well, it's reassembled and the noise is still there, after less than a 1min of running the filter again has no oil in it.
The pump seems to work, as there's vaseline coming out the port under the filter, when I remove the filter.
The new oil pressure switch isn't working, so I'll need to check for a blown globe at the dash.

