I forward my gmail and iCloud accounts to my Fastmail account where my own domain is setup. I also only use my new email address and replace the gmail and iCloud whenever I see it in use. It’s a long process but worth it.