Sounds like you are still a year or two away. I had my rt hip replaced 3 years ago and I just rode RAGBRAI last week. I am a slow healer and it took me more than a year to get back to 100%. You might want to get to the doctor because your knee pain may actually be causing you to put undue stress on your hips. A little therapy may go a long way.
__________________
2018 Breezer Greenway
2011 Raleigh International
'73 World Voyageurs -
Proud owner of all three colors made! Orange, Blue , Yellow .