I think Ratte's idea is going to be the best.

Aliasing foreskin and uncut to intact_foreskin is much more descriptive. And all instances of removed foreskin could be changed to disembodied_foreskin to bring them in-line with all the other disembodied tags (https://e621.net/tag?name=disembodied_*).

A quick look through the aliases and implications also seems to show no problems with switching any of them over, they would still work as they do now, they'd just be more intuitive.