I would say 2's enough for most people. I was concerned about the P2 changes but thankfully I don't have to deal with a resit. At least it will 'freshen it up' for you since it's your 3rd time on the same paper.
Go for 2 and make sure you get them. Making progress is the important thing.
