IDK what brand relays you have but I would consider replacing them with quality Omron relays.
The oil light situation: tomorrow first thing , check your oil level. If it is good , you will want to consider an oil / filter change. use a premium filter and good oil. If you feel confident about your skill level , install a Roper plate. a very important part. That oil light doesn't accidentally come on !
AFA the fuel pump goes , they are usually good or bad...no in between. The only other problem I have seen is the fuel will start leaking from the electrical terminals. If at all possible use an OEM pump. It is the correct dimension such as diameter , length, everything. Unless someone has an aftermarket part # that will fit perfectly ?