OK, here we go!!!
Bear in mind I live in CA where we are restricted to 10 rounds.
I bought some Promags for my FS. Frankly, they are ****! If you spend a few minutes on your favorite search engine, you'll find tons of complaints.
The spacing on the feed lips of the mags on a .40 are a bit wider than on a 9. This can cause feeding problems. For range use only, you *may* be OK. I would not squeeze the lips closer (OK, that sounds improper) since you may use them for .40 and possibly cause problems there.
Greg Cote is an outstanding vendor.
If you proceed with a barrel swap, please be careful to keep .40 with .40 and 9 with 9. Again, you can search to see the results of shooting a 9mm out of a .40 barrel.