personally i think you should stay with 2 unit unless you are absolutely failing! general maths is a different course (well at my school it is) and it consists of consumer arithmetic, statistics etc etc.
I'm pretty sure in yr 12 there will be a quick revision of the things learnt in general...