From what I saw the bimini has two places already on top for boards new to 2017 like the Z5 without the head knockers. Did you get the Autowake ? go ahead and upgrade to bigger bags.
Congrats !