Well have been there and done that with a previous pup
Can't say what would be absolutely right for your pup, but the answer for me was obedience training. Made a major difference for us. You do have to realize at 7 months they do have abounding energy and curiosity and want to play with everything. Obedience does take some of your time and energy, but it give you quality time with your pup and puts you in charge (eventually). I would trying it if you want to make the investment in your pup. Go and talk to the obedience people - local club, Petsmart etc. and see what they tell you.
Hope this helps. Probably is not an easy answer to this problem. Sometimes it takes more than love.