Your comment about long rate locks apply in any era, today or otherwise. Getting a rate lock over a long period of time is either impossible or very expensive. Also contrary to what another poster wrote, long term mortgages do still follow the 10 year treasury in my opinion. The difference now is that the spread is larger due to the risk premium demanded by the secondary market. What has not changed is that mortgage rates tend to rise immediately when the 10 year rises but they do not fall immediately when the 10 year falls.
HLS is one of the mortgage brokers that comes to mind and posts here. You may want to dig up his posts and get in touch with him to compare programs he can offer verses the ones you have already sampled.