It all sounds the same as how we do it in a C172 only when retracting the flap we go straight from 30deg to 10deg - then with +'ve IAS and ROC back to zero and climb out as normal (80kts).
Anything more than 10deg we consider 'drag flap' more than 'lift flap'.