I cant agree on your interpretation of Matt 22:30 (30 For in the resurrection they neither marry, nor are given in marriage, but are like the angels in heaven.) They dont marry and are like the angels, which also do not marry.
Not sure where the beaches and waves come from, because Revelation 21:1 says there will be no sea (1 I saw a new heaven and a new earth: for the first heaven and the first earth have passed away, and the sea is no more).
I would be interested to hear more of how you arrived at your position on these 2 points.