Pan Baffles and/or Windage Trays???

Yes to the windage tray and yes to pan baffles. Crank scrapers, IMO, are more suited to when you're trying to wring every last scrap of power out of the engine by minimizing parasitic losses eg. sticky oil.