A 1.6 would be a good swap but would cost you more. Currently you have everything to do the swap with no more to spend on other things. I have 92 FI sammy and like it hands down over any stock or weber carbed 1.3. I have a 87 engine for back up like you and it would go right in as you say. But you must make a block off plate for the fuel pump. Do it and you will be hooked on Fuel Injection forever, no turning back to funky carbs or crappy webers.