Throwing more hardware at an issue isn’t always the best solution.  But, as Tyler alluded to, a latching switch does get you where you want to go.  I’ll simply add that something like a Boss FS-6 or FS-7 will configure either switch (or both) as momentary or latching.