Switching to a witch hazel astringent or toner for aftershave might help. I would stay away from pre-shaves that are oil based for sure.