Ian, in your case your core license is still valid but the class rating is expired. You will need to go up with an examiner to do a test, but it won't be as hard as the original skills test.
Yes you will need to demonstrate your handling skills such as stalls and steep turns. I'm not sure about the diversion though.
Details are, once again, in LASORS.