Does the current spec meet your requirements? Yes? Get it.
What's the point! Might as well wait and see what happens?
Free upgrade is always good, if it happens.
If you can afford the extra for the 24" I'd strongly recommend you do that as it has a lot better panel. Apple Macs have a long shelf life anyway so the extra investment would be worth it.
I would go for a 24", but worried it may be a little large for the small space i have.....
But, well worth it if i can fit it in?