Chastity and orgasm denial discussion

Hello, I recently started my journey into chastity domination with my girlfriend. We’ve been at it for a little over a week, having had just one release so far. However, I’m facing a specific problem… My foreskin tends to swell up quite a bit, requiring me to take out the key every day to let the swelling subside. Still, I’d prefer to stay locked longer as that pleases my keyholder. My penis fits perfectly in this chastity cage when flaccid; the urethra is just close enough to poke through the peehole without issue. I previously tried a standard CB6000 but found it too large because my urethra kept getting blocked. Also, for those who need to know, I am uncircumcised. I keep myself in chastity with the foreskin retracted. Initially, I tried keeping it pulled up, but noticed it tends to drop back down during the night.