36's are a little small, 48's are a little big but they'll work.
I'd do a top end "rebuild", ad 94's for 2187cc, let the compression come up, maybe do a little more headwork depending on what you have now. Will 1.4 rockers work with the 86? Then the 48's will rip