Pool/spa with sunshelf and rock waterfall