Its two years since you posted Will. I'm guessing you've already found a solution to your Photoshop query. I'm in the camp that says stick with Adobe although I'm quite happy to sit on CS4 and see no real need to upgrade.

I did want to comment on the issue of no educational discount from Adobe. They do offer discuounts in Australia and if they do here then you should be able to access similar discounts wherever you are. I was actually able to by the entire CS3 Adobe Master Collection in 2007 i.e. all of the Audio, graphic design and video packages, everything! A value of over $3000.00 for under $500.00 AUD.

All that aside, it would be intereting to know how you eventually solved your dilemma.

Cheers,

Andrez