No - you have two entries to Europe, which is allowed only if one of them is a transit to or from one of the permitted African countries. Your Europe transit is from S Africa (not one of the exception countries).
If you swapped NBO and JNB it would be a valid xONE6.
This is unaffected by any rule changes in the last 5 years.