We play the following: when responder has hearts support he only introduces the spade suit if he has game forcing values. So if we have a simple raise, or a limit raise (even if just a three card limit raise), we bypass the spade suit. I think the bidding becomes much more comfortable with this agreement; it's easier to play!
An upside to this agreement is sequences like these:
1H-1S; 1NT-2H = Could show 2 hearts and 5 spades, looking for the right part score.
1H-1S; 1NT/2m-3H = Game forcing with 3 hearts and good 5+ spades.