one day trip must be a rush, buyt glad u enjoyed it ;-)
in your april trip, make sure it does not colide with hk holiday (long weekend, where too many people try to pass the border), but i believe week of 4/1 is fine (but not hte following 2 weeks)
for the carpet and stuff like that, a rule of thumb is at most half the price of simialr product u buy in the state (most likely 1/3). there is no correlation what the 1st quote is (for chinese the quote is usually double the final price, for u foreigner the quote is usually more than double)
now u know the place, u can spend a whole day in those theme parks. the best one is the minority nationality village (which i had not been to)...then window of the world (the effeil that u went), and window of china (miniature china)...do stay there in the evening as there r good live shows!