I feel for you.
I just read yesterday that there are some politicians in the US that are seeking to abolish the ATF and the 1938 gun law. Probably won't happen but what will likely happen is tighter controls on the ATF. They have lost multiple lawsuits in the Supreme Court recently. Overturning of the short barrel regulations would be a huge thing for me. I have two items that I'm basically doing nothing with because of that. A FinnishSoumi which is just short and a PPS43 which is classified as a pistol because the stock is welded in the folded position.
This law is just plain stupid. The Soumi sits without a barrel and is inoperable all because of a $200 tax stamp needed under the regulations. The PPS43 is fully functional other than the stock. Then there are the wood stocks for things like 45's, lugers and C96's. These are in a grey area that makes them appear to be legal but if you get the wrong prosecutor, who knows. I keep waiting because they keep talking about it but nothings been done yet. The most recent lawsuit dealt with pistol braces which are technically the same thing as a stock turning pistols into short barreled rifles and that was thrown out.