I would make it seamless and go with Aman all the way, Thimphu it self was my least favorite place in Bhutan. The Amankora Journey offers great value IMHO and you keep the same guide and driver with you the whole time.