What happens in FAA land is not relevant to the revaluation of a SEP Class rating on a JAR licence.
To all intents and purposes there is no such thing as P1/s in a PA28/C172 etc. It's something that in my view, instructors tell their hirers to log, so that they don't have to tell them log Pu/t! That is because the instructor is themselves logging P1 for the flights.
The simple question is were you are were you not the pilot in command. It would appear as if in this case the instructor was pilot in command (the operater would harldy let you be in command if you were only converting onto type, or had lost currency on type.) This is further clarrified by the fact that the instructor is logging P1, and you clearly agreed to this treatment as you logged P1/s rather than P1 yourself.
So the simple answer is that flights incorrectly logged as P1/s (ie not a JAR/CAA skills test) will not count as P1 hours for revaluation. They will however make up the balance of the 12 hours.
As you are obviously short of the 6 hours P1, you can expect that the examiner will examine your log book very carefully, and be EXTREMELY suspecious if he see that you've done 6 hours P1/s ....ie 6 CAA/JAA skills test, successfully passed!
The remainder of the hours can be any other form of flying.....principly additional P1 hours or Pu/t. It's just the minimum is 6 hours P1, but you can always have more than 6 hours P1...obviously
dp