One last thought, then I'm out of ideas: try to hook up an oil pressure gauge in place of the sending unit and see if the pressure jumps or does anything funky at higher rpm's (our stock gauges are basically an on/off thing, they only tell you if there's any pressure there at all)
That might explain the battery light issue as well...