OK, gonna try your long call diagonal with the BuPS.
BTO Jan 2019 30 call, STO Jan 2019 25/20 BuPS, and STO Jul 21 2017 37 call for 6.22 debit. Will look to sell the monthly calls and see where this takes me for the next year and a half. Will also check the weekly calls after July expiration. Thanks for the tip, @fuzzballl and @jsd501.