Im in too,will start epi myself on wednesday so will see how it goes for you, we could all exchange feedbacks here.
Your plan seems fine to me, I asked some suggestions around and pretty much told me to do more or the less as you're doing.
Anyway not sure if the fish oil is enough for joints...