I would stick with the OEM fuel pump as it will deliver guaranteed performance (in theory). Some of the aftermarket ones are fine but if it was me I'd stick with the OEM part.
As for the smell, you mentioned having to replace the valve cover gasket. I know when mine was leaking I would occasionally get a burning rubber smell. After replacing the valve cover gasket the smell went away. I have a hard time seeing the serpentine belt being the cause of the smell but it wouldn't hurt to get it replaced as well.