good work ;-)
You might want o look into a thing called (something like) primal movement for your added gym work.
Instead of static stuff like planks you do movement stuff that really works a good range of muscles and helps with core strength and flexibility.
i'm only just dipping a toe into it at the moment. But it looks interesting.