I would go for the bug!
In Brazil there is lot of I4 swaps on old bugs, they are sick!! I always loved those! But the boxer setup sounds better, even better with a air cooled porsche engine!!!