I don't think you needed to replace the character jokes with different ones. Sure, them being Japanese-based humor makes them less intuitive to understand, but I don't mind that, and your explanations were sufficient to get the point of the joke across without needing to redo it!
(This is all praise, by the way. Not dissing your work at all.)