DrewUAT
It sounds like you have it covered as far as wedges are concerned
"all though as suggested you could add a gap wedge" but it sounds to me like you need to practise your distance control,
ie: practise with a 1/4, 1/2, and a 3/4 swing this will help with the distance control.