It seems to me as if the OP, HM4rk, is considering purchasing a machine now for requirements that will not be needed until next year. This is not a good decision because there is an axiom regarding the purchase of computer hardware that states a computer hardware purchase decision should be based on today's needs, not tomorrow's needs.
This is due to numerous issues such as:
1) the constant decrease in computer prices. Why pay more now for something you do not need?
2) the constant introduction of new hardware. By this time next year your current system will be old and boring.
3) the possibility of the current system being damaged or possibly stolen while at school.
4) Economically speaking, due to inflation and the immeasurable aspect of having your money in your pocket for current needs, your current purchase would be even more expensive than purchasing better components next year when you actually need them.
5) It is not a good idea to consider purchasing hardware not currently needed as an investment, since it is not. Purchasing hardware that is not currently needed is a waste of good money.
My recommendation is to stick with your current needs and desires for now since it appears this is less costly than next year's needs will be.