I think this tool (PhraseMate) does what you are looking for
You get a couple of additional keyboard shortcuts (next/previous phrase). And also, it canautomatically enter Zxx commands whenever a note is written into the pattern (without the Zxx command in place, any notes entered would refer to whatever phrase is selected during playback).