You can customize keyboard shortcuts for individual named macros. Go to Keyboard Map under the Help menu, or go to Properties/Keyboard. You can find your macros under My Macro category.
There are commands for Next/Previous Bookmark for the current document. All you need to do is to reassign F2/Shift-F2 to Next/Previous Bookmark for the Current Document.
I will consider the multiline snippets as plug-in. Thanks!