From the outline of your days, it doesn't sound as if you're elevating/icing very much. At not two months post-op and with the pain you have, the majority of your time should be elevating/icing. Can you find a way to elevate at work? Did you elevate at the movies and lunch? I always mad sure I could prop my leg up at a restaurant and would only go to the movies if I could sit in a recliner. To get a good range of motion you need to get the swelling down and elevation/ice is the way that will happen. The best extention (straightening) exercise for me was bridging it between a chair and ottoman a few times everyday. It may take a month, but this recovery is long and progress happens slowly. Using the warm water of bath is a good idea though it will take some time.