Well i had to take a hospital drug test and I was 5"11 and 145 pounds at the time.. similar excercise and smoking habits as you and I used my first void of the day (the dirtyest sample) and passed after 18 days with no dilution.

EDIT: So I think you should be fine, but you can read the dilution sticky and maybe do a semi-dilute (cut everything on there in half) or just buy a home test and test yourself a few days prior to your test and see where you stand as far as being clean. If you still are coming up dirty just come back to this thread/ make a new one and we can go from there.