Entries

I'm not sure it warrants an extra sense, as it's really sense 1 in a Shinto context. Maybe this works.

The concept of Kami-sama is very different from the idea of a god, see reference 1.
I think that these meanings are so different that it deserves a separate entry for its English definition, the 3rd paragraph of the 1st reference makes clear that the concepts are different. 
For context, Kokugakuin is one of the main places where Shintō clergy are trained.

Additionally, within English language Shintō communities 神様 is not translated but instead transliterated.
A Shintō priestess has also stated that 神様 should not be translated in the context of Shintō, see reference 2 paragraph 12

I'll be more comfortable if "god" doesn't lead sense 2, as it doesn't mean a deity.

Hm. I should point out I did find a handful of entries 
in daijr which are read -さん but given as -様, namely 
いとさん【愛様・幼様】 (ksb) 
はばかりさん【憚り様】(ksb)
てきさん【敵様】(arch) (also in daijs)
I still think we should split though because -様 for 
-さん is definitely archaic and only relatively modern in 
ksb, at best. It's a strenuous connection for a merge 
esp. as it's in nikk alone - we don't merge entries 
based on nikk's lack of okurigana, for example.

I don't think it only refers to the Christian God

Proposing that 神さん is split out. Only nikk has 様 for 
さん - daij both just say "〔「さま（様）」の転〕". We don't 
normally include 様 for さん in other entries either.

Just trying to make sense 2 a little plainer.

[fig] on "god" is a little unsightly, sure. 
_
I guess in a wa-ei, it makes sense to just have the one 
"God" sense because when you're looking it up in 
context, it'll be obvious if the usage is figurative or 
not. But there are other use cases of a wa-ei as well. 
Say somebody is writing in Japanese and wants to make 
sure the word they just used carries the same 
connotations in Japanese as in English. As for this 
particular word, it's conceivable that using "God" in a 
non-religious setting could be offensive, or considered 
slang or whatever. Obviously it'd make the most sense to 
look it up in a kokugo, but not everybody learning 
Japanese can yet read one.

yeah, i don't really agree with that.  i'm a firm believer that we don't have to assume that our users are mindless and we don't need to spoon-feed them every little thing
-
also, if it's going to be indicated that "god" is figurative here, shouldn't it also be indicated that "ace" (lit meaning = 1) and "king" (lit meaning = royalty) are also being used figuratively here.  and then a [lit] indicator might as well be added to sense 1.
-
or just eliminate the mess, and gloss the entire entry with one sense as "God;god"

I think we should always be explicit, esp. 
when other dictionaries are. Users shouldn't 
have to guess whether or not a figurative use 
in English carries over into Japanese or not 
(many times it doesn't!)

is this addition needed?  the figurative sense is identical in both languages

Here, I think.

perhaps added here or in a separate entry.  the 神さん headword needs to be taken care of as well