I have a couple of things,
1. Diamond armor isn't everything, make sure to enchant the armor, or it's not very good. (prot 4 unbreaking 3 is the minimum personally)
2. When you start enchanting try and get fortune 3 as your first major enchant. This allows for more access to lapis, diamonds...