Miracle Man bridge would probably be best here.
Not sure what to recommend for the neck.
A recent post suggested Cold Sweat, Painkiller, or Miracle Man neck pickup as matches for the MM bridge. Out of those the CS would give the best cleans. I suspect a CS bridge would be too bright for this guitar.
EDIT: Sorry I see you have a single coil in the bridge. In that case maybe look at the Cobra T, a Piledriver, or a Seymour Duncan Quarter Pound. Personally though I think for the styles you mention you'd want a humbucker in the bridge.