Throw some Masteron(600mg/week) in option 2 I would go with that. Keep it as is, Option 1.