Not all of Model Master enamel line are going. Only certain colors. Model Master acrylics still remain. Why not give Mission Model acrylics a try. There have been nothing but great praise on their paint line. I have several bottles in my stash with more planned to add.
Tamiya paint line are pretty limited as far as color goes. There's nothing wrong with their acrylic line so why not choose acrylics instead? Their lacquer line having 60 colors to choose from isn't something to be excited about.
My suggestion - stock up on colors you use a lot at your LHS. Various online stores still carry Model Master enamels.