The 10,000 feet thing is because different airlines/legislative bodies have slightly different procedures. I the UK, for example, most airlines would switch the signs on at 10,000 feet for landing - but not all. In other countries, the signs come on a 20,000 feet with cabin prep done at Top Of Drop.
Seems to me that what you're doing now is the right thing.