Fatloss and gaining muscle is going to be a hard feat to accomplish for anyone. Think fatloss and muscle tone/retention for now is my advice.
In regards to fatloss there are other angles to it outside of cardio and thermogenics which you seem to have wrapped up pretty good. Great progress BTW. Anyhow I am not as well rounded foatloss because I am slim by nature but some of the more experienced in this field will hopefully chime in and help ya out.
An example is I see there is a new product just released my Omega Sports called ...it seems to from various angles...have a read....and good luck.