
I'd be careful using a water pistol and possibly the rattle bottle - the last thing you want is Tank learning that when he plays with the kitten, something unpleasant happens. Dogs (and cats) learn by association - he could learn that kitten makes nasty things happen!
It's nowhere near as extreme, but this effect is documented with dogs that live with an "invisible fence" (those underground electric fences for gardens) - many dogs have made negative associations with other dogs, people, locations etc because of a shock and have learned to either try and avoid that thing/person etc or actively try and get rid of it to avoid the shock (i.e. attack it).
Like I said, a water pistol is nowhere near as extreme as that example, but it does show how associative learning can backfire. With a dog that's going to grow as big as Tank probably will, I'd want all interactions with a kitten to be good ones!
I'd work with timeouts if the cat genuinely won't stop him - when he gets too rough, remove him (not the cat, always him) from the room for a minute so he learns that rough play is not allowed.