I support the idea of repairing using materials instead of same type of item. Maybe by boosting science one could get enough materials from looted guns to repair another one.
And possibly boost repairing and science a little on lower skill %. Make it scale slower, but from higher base.