For investment, both are OK if you invest like this.

Gold - Buy gold block from the famous shop with certificate.

Diamond - Buy loose good color (E), clarity (VVS1)and Carat (0.5 - 0.7) with certificate. Don't buy one carat diamond which is double price.

If you want to have good return, you have to invest quality one. Good luck in investment.