Getting back into the replacement engine question i am no expert but I believe Mazda do a couple of engines which would match up nicely with the gearbox. They're in a little roadster called a MX something or other :-)