Since you are getting your company stock at a 10% discount, you should considering getting as much of it as you can afford and tolerate. I say tolerate because the caveat to investing heavily in the company you are employed by is that if the company goes south, so could your job (the all of your eggs are in one basket analogy).
If you are in the accumulation (i.e. contributing) phase of investing, use bonds sparingly, if at all, at least now when interest rates are so low.
Your 25 To Go Fund is 60% stock and 40% bonds. A commonly used formula is 100-your age in stock; the rest in bonds. So one was 40 (which your are not), with 25 years to retirement, 60% in stock, 40% in bonds.
The problem with the formula is that it doesn't take into account current economic conditions (like near zero interest rates) nor your current/expected financial situation. While in theory there are a couple of reasons for holding bonds, in practice the only reason to hold bonds is so that you will have them to cash out and spend. Even though a 100% equity portfolio will have greater swings in value, both up and down, than a mixed portfolio (containing some bonds), the 100% equity portfolio will be worth more in the long run.
In reviewing what I posted and one of the subsequent answers in that thread re: bonds. I reiterate that with interest rates near 0 and consequently no where to go but up, bonds are an extremely risky investment at this time.