China visa...3 months one entry (Feb 28-March13 2015) Photo dated Nov 14 2014

Hi
I got a 3 months one entry (Feb 28-March13 2015) recently for travels before the 10 years visa came in between China and Canada. I am now planning a cruise boat trip in Sept/2016 entering Shanghai and departing by Air. What type do I need.
If I apply for the 10 year one in July of 2016....my Passport is dated to expired in Jan of 2025. Is that still acceptable? or do I need to apply for the 10 year type now?
Sue