I don't know that there's really a set answer for this. The OED isn't exactly on the vanguard when it comes to sexual slang.

For what it's worth, I think that your view seems to be the most commonly accepted one. But in all the published erotica I've read, they use "come" for both the noun and the verb. In amateur erotica online, I see "cum" used far more often.