Do you still have the Trek? Assuming your knees didn't hurt riding the 820 you could measure the seat height and saddle set back and transfer those settings to the new bike then sort out the reach after that.
Barring that I'd suggest taking it back and getting the LBS to make you happy.