Your MX-25's in graphite are fine, nothing wrong with graphite at all.
For your woods and hybrids you may want to go with a senior flex, but I think a regular should be fine. If you feel as though you can improving, then a regular is probably a better investment.
The choice of shaft depends on what sort of launch and weight you prefer.