Yes definitely keep the weight on the front foot. I've been struggling too of late and was given an absolutely brilliant tip today: take a much shorter backswing than you think you need for the distance. This will ensure that you accelerate and punch through the ball rather than waft at it and try to scoop it up. With a bit of readjustment I find that this worked great for both 20 yard shots with a lob wedge and 120 yard shots into the wind with a 9-iron.