Anyway, what I suggest is suspension first.
An engine swap or ihe can wait until you set goals to what kinda power you want to put out..
dont be like every other person who gets a swap and say "I want 350 HP na, NOW!"
It wont work that way. Anyway, I would do suspension, it really does help add alot of enjoyability when driving :0