I somehow missed your post and so wrote a comment covering almost all of this. Went ahead and deleted mine as yours is far clearer, and op has already responded