As I see it here's what I think should happen:
65141c01 - Remains as is, since the cap is already color 16 there is no need for 65141c02 (which can be removed).
65151-f1 should have never been made official with a hard coded cap color. Now I see where your confusion came in.
Since the damage is done Magnus is correct:
65151-f1/f2 -> 65151c01-f1/f2
your 65151p01-f1/f2 -> 65151c02-f1/f2
remove your 65151c01-f1/f2
65141c01 - Remains as is, since the cap is already color 16 there is no need for 65141c02 (which can be removed).
65151-f1 should have never been made official with a hard coded cap color. Now I see where your confusion came in.
Since the damage is done Magnus is correct:
65151-f1/f2 -> 65151c01-f1/f2
your 65151p01-f1/f2 -> 65151c02-f1/f2
remove your 65151c01-f1/f2