I don't know much about raycasting but I think you can fix the fish eye by just narrowing your field of view. Taking all the angles and dividing by a set amount might do the trick.