I have 3 sons non of them have been circumsised. I was once upon a time all for it, I guess because my brothers were done, until I watched a video on the procedure some 17 + years ago. Yes I know it has changed since then though. We have never had any health issues or cleanliness issues with it.

My DP is done and he wanted to have Noah done, I told him if he wanted it done he could take him and look after him after it was done. Alas he never took him

IF your partner says it's about cleanliness and not religion it won't matter to him if it is done by a Rabi or not then. If this is the case you can get it done by a Dr instead, who will use pain relief.
I feel so sad for the poor baby that you saw done. There is no way they can say it doesn't hurt, all skin has nerve endings and feelings.