Beause of confusion of upgrading, etc., I just applied for the new card. Applied for my wife, also. We both got the 15K, 15 nights, and the free night cert. Don't know about the golf thing.
I had intended to cancel the other card when the renewal fee came due, but it never has, so I have both cards. I have to remember to use the new one, because I suspect the old one will only get me 3 pts/$ on Marriott spend.