Aman Lijiang just completed their fist mock room and waiting for second one now. You may found the design is very similar to Amanfayun. They may opening in mid-2013.

They do have bathtub in the guest room now, which is really good news.
Amanfayun only provides in SPA. Aman Lijiang and Amanfayun are same owner from Mainland.