LiPo switch over PMOS
I would use back-to-back P channel MOSFETs. The two body diodes will be opposite so they will never conduct, and you get the benefit of the Low on-resistance of the MOSFET.
See this electronics stackexchange answer for details: Switch 5V with back voltage protection