I unfortunately don't have an easy answer. If Pi supply continues to rebound like they say it will, the situation should improve significantly for all of us.