I had a similiar problem, on fact almost the same problem. What I did was use luma 5.2 and launch it a few times, then Updated luma and did the 2.1 downgrade. After that later on in the guide when you restore your sysnand from emunand i had to downgrade luma back to 5.2 as i got a black screen...